From a42cd292a2dbd283e9dda3f7842f3164cdc5addc Mon Sep 17 00:00:00 2001 From: Antony Messerli Date: Wed, 26 Sep 2018 18:21:00 -0500 Subject: [PATCH] Set password file location --- scripts/ubuntu16-pike-to-queens.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/scripts/ubuntu16-pike-to-queens.sh b/scripts/ubuntu16-pike-to-queens.sh index bc358022..33b08d6b 100755 --- a/scripts/ubuntu16-pike-to-queens.sh +++ b/scripts/ubuntu16-pike-to-queens.sh @@ -37,6 +37,16 @@ else popd fi +if [ -f "/etc/openstack_deploy/user_secrets.yml" ]; then + if ! grep "^osa_secrets_file_name" /etc/openstack_deploy/user_rpco_upgrade.yml; then + echo 'osa_secrets_file_name: "user_secrets.yml"' >> /etc/openstack_deploy/user_rpco_upgrade.yml + fi +elif [ -f "/etc/openstack_deploy/user_osa_secrets.yml" ]; then + if ! grep "^osa_secrets_file_name" /etc/openstack_deploy/user_rpco_upgrade.yml; then + echo 'osa_secrets_file_name: "user_osa_secrets.yml"' >> /etc/openstack_deploy/user_rpco_upgrade.yml + fi +fi + pushd /opt/openstack-ansible git checkout ${OSA_SHA} scripts/bootstrap-ansible.sh