diff options
| author |   Giulio Fidente <gfidente@redhat.com> | 2016-03-23 17:14:22 +0100 |
|---|---|---|
| committer |   Jiri Stransky <jistr@redhat.com> | 2016-04-11 14:27:55 +0200 |
| commit | 2d92911838fdecdbc522e9e1b095c1b1b09029e0 (patch) | |
| tree | 2390c9d1e489affe2d45c59871bffd54d9eca250 /extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh | |
| parent | 706c2fe4b62f95ac13ee800fc08e549180afc810 (diff) | |
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
Diffstat (limited to 'extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh')
| -rwxr-xr-x | extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh b/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh index 10bea573..28e279b0 100755 --- a/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh +++ b/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh @@ -55,10 +55,8 @@ if [ "$(hiera -c /etc/puppet/hiera.yaml bootstrap_nodeid)" = "$(facter hostname) check_resource rabbitmq started 600 pcs resource enable redis check_resource redis started 600 - if pcs status | grep openstack-keystone; then - pcs resource enable openstack-keystone - check_resource openstack-keystone started 1800 - fi + pcs resource enable openstack-core + check_resource openstack-core started 1800 pcs resource enable httpd check_resource httpd started 1800 fi |