diff --git a/tests/infrared/17.1/README.md b/tests/infrared/17.1/README.md index 15bcf37a9..0db5c0734 100644 --- a/tests/infrared/17.1/README.md +++ b/tests/infrared/17.1/README.md @@ -6,6 +6,7 @@ OCP_ROUTE_IP="10.0.100.50" \ CA_CERT_FILE_CONTENT="$(oc get secret/default-interconnect-selfsigned -o jsonpath='{.data.ca\.crt}' | base64 -d)" \ AMQP_HOST="$(oc get route default-interconnect-5671 -ojsonpath='{.spec.host}')" \ +AMQP_PASS="$(oc get secret default-interconnect-users -o json | jq -r .data.guest | base64 -d)" \ ENABLE_STF_CONNECTORS=true \ ENABLE_GNOCCHI_CONNECTORS=false \ CONTROLLER_MEMORY="24000" \ diff --git a/tests/infrared/17.1/infrared-openstack.sh b/tests/infrared/17.1/infrared-openstack.sh index 9743a0081..a55de8894 100755 --- a/tests/infrared/17.1/infrared-openstack.sh +++ b/tests/infrared/17.1/infrared-openstack.sh @@ -1,12 +1,11 @@ #!/usr/bin/env bash set -e -# Usage: -# VIRTHOST=my.big.hypervisor.net -# ./infrared-openstack.sh +# Usage: See README.md VIRTHOST=${VIRTHOST:-localhost} AMQP_HOST=${AMQP_HOST:-stf-default-interconnect-5671-service-telemetry.apps-crc.testing} AMQP_PORT=${AMQP_PORT:-443} +AMQP_PASS=${AMQP_PASS:-} SSH_KEY="${SSH_KEY:-${HOME}/.ssh/id_rsa}" NTP_SERVER="${NTP_SERVER:-clock.redhat.com,10.5.27.10,10.11.160.238}" CLOUD_NAME="${CLOUD_NAME:-cloud1}" @@ -97,7 +96,7 @@ ir_create_undercloud() { } stf_create_config() { - sed -r "s/<>/${AMQP_HOST}/;s/<>/${AMQP_PORT}/;s/<>/${CLOUD_NAME}/;s%<>%${CA_CERT_FILE_CONTENT//$'\n'/<@@@>}%;s/<@@@>/\n /g" ${STF_ENVIRONMENT_TEMPLATE} > outputs/stf-connectors.yaml + sed -r "s/<>/${AMQP_HOST}/;s/<>/${AMQP_PORT}/;s/<>/${AMQP_PASS}/;s/<>/${CLOUD_NAME}/;s%<>%${CA_CERT_FILE_CONTENT//$'\n'/<@@@>}%;s/<@@@>/\n /g" ${STF_ENVIRONMENT_TEMPLATE} > outputs/stf-connectors.yaml } gnocchi_create_config() { @@ -167,6 +166,11 @@ if [ -z "${CA_CERT_FILE_CONTENT}" ]; then exit 1 fi +if [ -z "${AMQP_PASS}" ]; then + echo "AMQP_PASS must be set and passed to the deployment, or QDR will fail to connect." + exit 1 +fi + time if ${TEMPEST_ONLY}; then echo "-- Running tempest tests" ir_run_tempest diff --git a/tests/infrared/17.1/stf-connectors.yaml.template b/tests/infrared/17.1/stf-connectors.yaml.template index 1031e097b..1dfa26827 100644 --- a/tests/infrared/17.1/stf-connectors.yaml.template +++ b/tests/infrared/17.1/stf-connectors.yaml.template @@ -16,6 +16,8 @@ custom_templates: role: edge verifyHostname: false sslProfile: sslProfile + saslUsername: guest@default-interconnect + saslPassword: pass:<> MetricsQdrSSLProfiles: - name: sslProfile