Skip to content

Commit 2ac396f

Browse files
Merge pull request #1048 from pinikomarov/fix_PASSWORD_FILE
fix PASSWORD FILE
2 parents 69ca219 + 94cf009 commit 2ac396f

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

docs_user/modules/proc_retrieving-topology-specific-service-configuration.adoc

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,16 @@ endif::[]
2727
$ declare -A TRIPLEO_PASSWORDS
2828
ifeval::["{build_variant}" != "ospdo"]
2929
$ CELLS="default cell1 cell2"
30+
endif::[]
31+
ifeval::["{build_variant}" == "ospdo"]
32+
$ CELLS="default"
33+
endif::[]
3034
$ for CELL in $(echo $CELLS); do
3135
> TRIPLEO_PASSWORDS[$CELL]="$PASSWORD_FILE"
3236
> done
33-
endif::[]
3437
ifeval::["{build_variant}" == "ospdo"]
35-
$ CELLS="default"
3638
$ for CELL in $(echo $CELLS); do
37-
> oc get secret tripleo-passwords -o json | jq -r '.data["tripleo-overcloud-passwords.yaml"]' | base64 -d >"$TRIPLEO_PASSWORDS[$CELL]"
39+
> oc get secret tripleo-passwords -o json | jq -r '.data["tripleo-overcloud-passwords.yaml"]' | base64 -d >"${TRIPLEO_PASSWORDS[$CELL]}"
3840
> done
3941
endif::[]
4042
$ declare -A SOURCE_DB_ROOT_PASSWORD
@@ -181,7 +183,7 @@ $ if [ "$PULL_OPENSTACK_CONFIGURATION_MYSQLCHECK_NOK" != "" ]; then
181183
+
182184
----
183185
export PULL_OPENSTACK_CONFIGURATION_NOVADB_MAPPED_CELLS=$(oc run mariadb-client-1 ${MARIADB_RUN_OVERRIDES} -q --image ${MARIADB_IMAGE} -i --rm --restart=Never -- \
184-
mysql -rsh "${SOURCE_MARIADB_IP['default]}" -uroot -p"${SOURCE_DB_ROOT_PASSWORD['default']}" nova_api -e \
186+
mysql -rsh "${SOURCE_MARIADB_IP['default']}" -uroot -p"${SOURCE_DB_ROOT_PASSWORD['default']}" nova_api -e \
185187
'select uuid,name,transport_url,database_connection,disabled from cell_mappings;')
186188
----
187189

0 commit comments

Comments
 (0)