Merge pull request #245 from antonym/set_passwd_file_loc

Set password file location
rcbops · Sep 26, 2018 · dcc30ed · dcc30ed
2 parents e44cbfd + a42cd29
commit dcc30ed
Showing 1 changed file with 10 additions and 0 deletions.
diff --git 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