Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Disable the Mon/OSD/Client resources in puppet-ceph-external"
[apex-tripleo-heat-templates.git]
/
extraconfig
/
tasks
/
pacemaker_resource_restart.sh
diff --git
a/extraconfig/tasks/pacemaker_resource_restart.sh
b/extraconfig/tasks/pacemaker_resource_restart.sh
index
09a452e
..
b2e5be1
100755
(executable)
--- a/
extraconfig/tasks/pacemaker_resource_restart.sh
+++ b/
extraconfig/tasks/pacemaker_resource_restart.sh
@@
-8,7
+8,7
@@
pacemaker_status=$(systemctl is-active pacemaker)
# and we're updating the deployment (not creating).
if [ "$pacemaker_status" = "active" -a \
"$(hiera bootstrap_nodeid)" = "$(facter hostname)" -a \
# and we're updating the deployment (not creating).
if [ "$pacemaker_status" = "active" -a \
"$(hiera bootstrap_nodeid)" = "$(facter hostname)" -a \
- "$(hiera
update_identifier)" != "nil
" ]; then
+ "$(hiera
stack_action)" = "UPDATE
" ]; then
#ensure neutron constraints like
#https://review.openstack.org/#/c/245093/
#ensure neutron constraints like
#https://review.openstack.org/#/c/245093/
@@
-18,8
+18,8
@@
if [ "$pacemaker_status" = "active" -a \
pcs resource disable httpd
check_resource httpd stopped 300
pcs resource disable httpd
check_resource httpd stopped 300
- pcs resource disable openstack-
keyston
e
- check_resource openstack-
keyston
e stopped 1800
+ pcs resource disable openstack-
cor
e
+ check_resource openstack-
cor
e stopped 1800
if pcs status | grep haproxy-clone; then
pcs resource restart haproxy-clone
if pcs status | grep haproxy-clone; then
pcs resource restart haproxy-clone
@@
-30,15
+30,9
@@
if [ "$pacemaker_status" = "active" -a \
pcs resource restart memcached-clone
pcs resource restart galera-master
pcs resource restart memcached-clone
pcs resource restart galera-master
- pcs resource enable openstack-
keyston
e
- check_resource openstack-
keyston
e started 1800
+ pcs resource enable openstack-
cor
e
+ check_resource openstack-
cor
e started 1800
pcs resource enable httpd
check_resource httpd started 800
fi
pcs resource enable httpd
check_resource httpd started 800
fi
-
-if [ "$pacemaker_status" = "active" ]; then
- # TODO(marios): remove this once +bug/1561012
- # need this on all controllers:
- systemctl reload haproxy
-fi