summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-12 23:38:51 +0000
committerGerrit Code Review <review@openstack.org>2017-06-12 23:38:51 +0000
commitb49149206b252675ca15460f7a0cae0bd6b6817d (patch)
tree51a63afb9a40d9f56860a7061fd5a4fc67c7617c
parent688d7febea8bb7cb6bb6e1dfe491d1500b05e307 (diff)
parent016140bc9ebd6a3b9d7616b88ccba54fbc7394a2 (diff)
Merge "Cleanup cinder paste configuration for ssl." into stable/newton
-rwxr-xr-xextraconfig/tasks/major_upgrade_controller_pacemaker_2.sh10
1 files changed, 10 insertions, 0 deletions
diff --git a/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh b/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh
index 9d9b445..ae0a0b8 100755
--- a/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh
+++ b/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh
@@ -102,6 +102,16 @@ fi
102# Special-case OVS for https://bugs.launchpad.net/tripleo/+bug/1669714 102# Special-case OVS for https://bugs.launchpad.net/tripleo/+bug/1669714
103special_case_ovs_upgrade_if_needed 103special_case_ovs_upgrade_if_needed
104 104
105if grep -q '^pipeline = ssl_header_handler faultwrap osvolumeversionapp' /etc/cinder/api-paste.ini; then
106 # Revert back cinder SSL setup as it's going to be handled by wsgi.
107 echo "Removing default ssl configuration for rpm configuration upgrade."
108 crudini --del /etc/cinder/api-paste.ini filter:ssl_header_handler
109 crudini --set /etc/cinder/api-paste.ini pipeline:apiversions pipeline 'cors http_proxy_to_wsgi faultwrap osvolumeversionapp'
110 ## remove empty line at eof if present.
111 sed -i '$ { /^$/d }' /etc/cinder/api-paste.ini
112fi
113
114
105yum -y install python-zaqarclient # needed for os-collect-config 115yum -y install python-zaqarclient # needed for os-collect-config
106yum -y -q update 116yum -y -q update
107 117