openstack
/
openstack
Code Issues Proposed changes

Update git submodules 

* Update puppet-tripleo from branch 'master'
  - Merge "Implement stonith levels and enable kdump agent."
  - Implement stonith levels and enable kdump agent.
    
    This commit extends the stonith generation logic to allow operators
    to make use of fencing levels.
    Given a fence.yaml file like the following:
    
    parameter_defaults:
      EnableFencing: true
      FencingConfig:
        devices:
          level1:
          - agent: fence_agent1
            host_mac: aa:bb:cc:dd:ee:ff
            params:
              someparam: somevalue
          level2:
          - agent: fence_agent2
            host_mac: aa:bb:cc:dd:ee:ff
            params:
              someotherparam: someothervalue
    
    The code iterates over the "levelX" key and creates the respective
    stonith resources and adds them to the specified stonith level.
    
    It should be backwards compatible since it checks if "devices" is
    an array (no level specified) and reconducts this case to level=1.
    
    Example results below.
    
    * without levels:*
    
    hieradata:
    
        "tripleo::fencing::config": {
            "devices": [
                {
                    "agent": "fence_ipmilan",
                    "host_mac": "e4:43:4b:4b:c8:19",
    
    [root@overcloud-controller-0]# pcs status
    ...
    
     stonith-fence_ipmilan-e4434b4bc819     (stonith:fence_ipmilan):        Started overcloud-controller-1
    
    [root@overcloud-controller-0]# pcs stonith level
    Target: overcloud-controller-0
      Level 1 - stonith-fence_ipmilan-e4434b4bc819
    
    * with levels: *
    
    hieradata:
    
        "tripleo::fencing::config": {
            "devices": {
                "level1": [
                   {
                   "agent": "fence_ipmilan",
                   "host_mac": "e4:43:4b:4b:c8:19",
                ...
                "level2": [
                   {
                   "agent": "fence_kdump",
                   "host_mac": "e4:43:4b:4b:c8:19",
    
    [root@overcloud-controller-0 ]# pcs status
    ...
     stonith-fence_ipmilan-e4434b4bc819     (stonith:fence_ipmilan):        Started overcloud-controller-1
     stonith-fence_kdump-e4434b4bc819       (stonith:fence_kdump):  Started overcloud-controller-2
    
    [root@overcloud-controller-0 ]# pcs stonith level
    Target: overcloud-controller-0
      Level 1 - stonith-fence_ipmilan-e4434b4bc819
      Level 2 - stonith-fence_kdump-e4434b4bc819
    
    Change-Id: I42033be840ba41e9944af65815a63059834144e9
This commit is contained in:
Zuul 2019-04-28 21:44:40 +00:00 committed by Gerrit Code Review
parent 99d935a107
commit ca072c51c6
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-tripleo

@ -1 +1 @@
Subproject commit 6b61b805814e7be77b46215bac4336803a5a982c
Subproject commit 9796ecc00a2f09c2245337dedf1484261e783ab3