Skip to content

Commit 94e343c

Browse files
authored
QDR Auth for infrared 17.1 script (#517) (#528)
* QDR Auth for infrared 17.1 script * Fix missing substitution for AMQP_PASS in infrared script (cherry picked from commit d12aa38)
1 parent c896687 commit 94e343c

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

tests/infrared/17.1/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
OCP_ROUTE_IP="10.0.100.50" \
77
CA_CERT_FILE_CONTENT="$(oc get secret/default-interconnect-selfsigned -o jsonpath='{.data.ca\.crt}' | base64 -d)" \
88
AMQP_HOST="$(oc get route default-interconnect-5671 -ojsonpath='{.spec.host}')" \
9+
AMQP_PASS="$(oc get secret default-interconnect-users -o json | jq -r .data.guest | base64 -d)" \
910
ENABLE_STF_CONNECTORS=true \
1011
ENABLE_GNOCCHI_CONNECTORS=false \
1112
CONTROLLER_MEMORY="24000" \

tests/infrared/17.1/infrared-openstack.sh

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
#!/usr/bin/env bash
22
set -e
33

4-
# Usage:
5-
# VIRTHOST=my.big.hypervisor.net
6-
# ./infrared-openstack.sh
4+
# Usage: See README.md
75
VIRTHOST=${VIRTHOST:-localhost}
86
AMQP_HOST=${AMQP_HOST:-stf-default-interconnect-5671-service-telemetry.apps-crc.testing}
97
AMQP_PORT=${AMQP_PORT:-443}
8+
AMQP_PASS=${AMQP_PASS:-}
109
SSH_KEY="${SSH_KEY:-${HOME}/.ssh/id_rsa}"
1110
NTP_SERVER="${NTP_SERVER:-clock.redhat.com,10.5.27.10,10.11.160.238}"
1211
CLOUD_NAME="${CLOUD_NAME:-cloud1}"
@@ -97,7 +96,7 @@ ir_create_undercloud() {
9796
}
9897

9998
stf_create_config() {
100-
sed -r "s/<<AMQP_HOST>>/${AMQP_HOST}/;s/<<AMQP_PORT>>/${AMQP_PORT}/;s/<<CLOUD_NAME>>/${CLOUD_NAME}/;s%<<CA_CERT_FILE_CONTENT>>%${CA_CERT_FILE_CONTENT//$'\n'/<@@@>}%;s/<@@@>/\n /g" ${STF_ENVIRONMENT_TEMPLATE} > outputs/stf-connectors.yaml
99+
sed -r "s/<<AMQP_HOST>>/${AMQP_HOST}/;s/<<AMQP_PORT>>/${AMQP_PORT}/;s/<<AMQP_PASS>>/${AMQP_PASS}/;s/<<CLOUD_NAME>>/${CLOUD_NAME}/;s%<<CA_CERT_FILE_CONTENT>>%${CA_CERT_FILE_CONTENT//$'\n'/<@@@>}%;s/<@@@>/\n /g" ${STF_ENVIRONMENT_TEMPLATE} > outputs/stf-connectors.yaml
101100
}
102101

103102
gnocchi_create_config() {
@@ -167,6 +166,11 @@ if [ -z "${CA_CERT_FILE_CONTENT}" ]; then
167166
exit 1
168167
fi
169168

169+
if [ -z "${AMQP_PASS}" ]; then
170+
echo "AMQP_PASS must be set and passed to the deployment, or QDR will fail to connect."
171+
exit 1
172+
fi
173+
170174
time if ${TEMPEST_ONLY}; then
171175
echo "-- Running tempest tests"
172176
ir_run_tempest

tests/infrared/17.1/stf-connectors.yaml.template

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ custom_templates:
1616
role: edge
1717
verifyHostname: false
1818
sslProfile: sslProfile
19+
saslUsername: guest@default-interconnect
20+
saslPassword: pass:<<AMQP_PASS>>
1921

2022
MetricsQdrSSLProfiles:
2123
- name: sslProfile

0 commit comments

Comments
 (0)