openstack
/
openstack
Code Issues Proposed changes

Update git submodules 

* Update puppet-pacemaker from branch 'master'
  to bb5e14d4fa889ac15a420aef617b2e79620ed56d
  - Merge "Remove old workarounds for broken crm_diff"
  - Remove old workarounds for broken crm_diff
    
    Reason for this is that there are two functions to detect a change in a
    pcmk resource:
    - pacemaker_restart_resource? -> which parses crm_simulate and was
      necessary due to https://bugzilla.redhat.com/show_bug.cgi?id=1561617
      (Fixed in pacemaker-1.1.18-12)
    - pacemaker_restart_resource_ng? -> which is the preferred one and uses
      crm_diff xml output (and is a lot simpler).
    
    We can remove pacemaker_restart_resource? fully now that newton and
    Centos 7 are unsupported.
    
    Tested as follows:
    - Deployed a fresh Train overcloud w/ this change
    - Ran a redeployment forcing a config change on an HA bundle
    - Ran another redeployment forcing a CIB change on an HA bundle
      OVNDBSPacemakerMonitorIntervalSlave: 666
      observed that the bundle was restarted correctly:
      [root@controller-0 ~]# pcs resource config ovn-dbs-bundle |grep 666
         monitor interval=666s role=Slave timeout=60s (ovndb_servers-monitor-interval-666s)
    - Also tested in CI via https://review.opendev.org/c/openstack/tripleo-heat-templates/+/803101
    
    Change-Id: Iba736839ae12f3adf180b53cd7fc5c552d03bd47
This commit is contained in:
Zuul 2021-08-11 10:28:26 +00:00 committed by Gerrit Code Review
parent c450ffbb9b
commit 2ea7409494
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet-pacemaker

@ -1 +1 @@
Subproject commit 90be0f9e65399a80cdd4907e757a8274cd381df4
Subproject commit bb5e14d4fa889ac15a420aef617b2e79620ed56d