openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Remove deprecated minor update pcs code 

We fixed pcs resources start/stop timeouts via
I587136d8d045d213875c657ea5a405074f80c8ad in Nov 2015.for mitaka.

And there we stated:
  This can be removed once updates from deployments made prior to
  I6fc18f1ad876c5a25723710a3b20d8ec9519dcba are no longer supported.

We can now safely remove these updates as they are useless and cost time
anyway.

Change-Id: Ibad2b3eed0d08560d52d5ebe700746b61e5b8f51
This commit is contained in:
Michele Baldessari 2017-04-27 21:46:40 +02:00
parent d3f842ecd0
commit 61d1905da4
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
extraconfig/tasks/yum_update.sh
View File

@ -60,24 +60,6 @@ if hiera -c /etc/puppet/hiera.yaml service_names | grep -q pacemaker; then
pacemaker_status=$(systemctl is-active pacemaker)
fi
# Fix the redis/rabbit resource start/stop timeouts. See https://bugs.launchpad.net/tripleo/+bug/1633455
# and https://bugs.launchpad.net/tripleo/+bug/1634851
if [[ "$pacemaker_status" == "active" && \
"$(hiera -c /etc/puppet/hiera.yaml bootstrap_nodeid)" = "$(facter hostname)" ]] ; then
if pcs resource show rabbitmq | grep -E "start.*timeout=100"; then
pcs resource update rabbitmq op start timeout=200s
fi
if pcs resource show rabbitmq | grep -E "stop.*timeout=90"; then
pcs resource update rabbitmq op stop timeout=200s
fi
if pcs resource show redis | grep -E "start.*timeout=120"; then
pcs resource update redis op start timeout=200s
fi
if pcs resource show redis | grep -E "stop.*timeout=120"; then
pcs resource update redis op stop timeout=200s
fi
fi
# special case https://bugs.launchpad.net/tripleo/+bug/1635205 +bug/1669714
special_case_ovs_upgrade_if_needed