diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-04-26 17:02:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-04-26 17:02:34 +0000 |
| commit | 6a794c43280e0c04a1d373500dbb2eeea7799a9c (patch) | |
| tree | 054160de90228708929025b461f836fd068adbc0 /extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh | |
| parent | 16cb316f691169869956ed58efc41db8b5ebcccb (diff) | |
| parent | 2d92911838fdecdbc522e9e1b095c1b1b09029e0 (diff) | |
Merge "Update .sh references from openstack-keystone to openstack-core"
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 |