From 2d92911838fdecdbc522e9e1b095c1b1b09029e0 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Wed, 23 Mar 2016 17:14:22 +0100 Subject: Update .sh references from openstack-keystone to openstack-core The update and upgrade shell scripts were still referencing the old openstack-keystone service which got removed with Ie26908ac9bfc0b84b6b65ae3bda711236b03d9d4 Also removes kilo and liberty specific workarounds and config changes. Change-Id: Icc80904908ee3558930d4639a21812f14b2fd12e --- extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh') diff --git a/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh b/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh index bf2ee330..2cbdc539 100755 --- a/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh +++ b/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh @@ -12,10 +12,8 @@ fi if [ "$(hiera -c /etc/puppet/hiera.yaml bootstrap_nodeid)" = "$(facter hostname)" ]; then pcs resource disable httpd check_resource httpd stopped 1800 - if pcs status | grep openstack-keystone; then - pcs resource disable openstack-keystone - check_resource openstack-keystone stopped 1800 - fi + pcs resource disable openstack-core + check_resource openstack-core stopped 1800 pcs resource disable redis check_resource redis stopped 600 pcs resource disable mongod -- cgit 1.2.3-korg