From 928af8a9ac4e031f8387dd0445223fb3a7c48ed1 Mon Sep 17 00:00:00 2001 From: Nolan Brubaker Date: Wed, 29 Jul 2015 16:05:26 -0400 Subject: [PATCH] Remove reference to missing user_group_vars file The in-tree version of user_group_vars.yml was removed in 30f9443c5d2f3a3bbb51bf75ad5743ef46c9b0ef, but the corresponding reference in the upgrade script was not also updated. This commit changes the behavior to remove the file from /etc/ if found. Change-Id: I9f5b061289c5f43e32983845469f5123cc9f209d Closes-Bug: #1479501 --- scripts/run-upgrade.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/run-upgrade.sh b/scripts/run-upgrade.sh index 1ebd019d8a..e874e8e0bb 100755 --- a/scripts/run-upgrade.sh +++ b/scripts/run-upgrade.sh @@ -152,11 +152,10 @@ echo 'ssl_protocol: "ALL -SSLv2 -SSLv3"' | tee -a /etc/openstack_deploy/user_var # Cipher suite string from "https://hynek.me/articles/hardening-your-web-servers-ssl-ciphers/". echo 'ssl_cipher_suite: "ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:!aNULL:!MD5:!DSS"' | tee -a /etc/openstack_deploy/user_variables.yml -# Ensure that the user_group_vars.yml file is present on upgrade, if not found copy it over -if [ ! -f "/etc/openstack_deploy/user_group_vars.yml" ];then - cp etc/openstack_deploy/user_group_vars.yml /etc/openstack_deploy/user_group_vars.yml +# Ensure that the user_group_vars.yml file is not present. +if [ -f "/etc/openstack_deploy/user_group_vars.yml" ];then + rm /etc/openstack_deploy/user_group_vars.yml fi - # If OLD ldap bits found in the user_variables file that pertain to ldap upgrade them to the new syntax. if grep '^keystone_ldap.*' /etc/openstack_deploy/user_variables.yml;then python <