Merge "Force ansible serial to 1 for the Controller" into stable/stein

2019-06-13 13:59:48 +00:00 · 2019-06-13 13:59:48 +00:00 · 17ba8d8350
commit 17ba8d8350
parent 8ba51e65f2 0339c45d99
46 changed files with 80 additions and 8 deletions
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@ -528,9 +528,10 @@ outputs:
              gather_facts: no
              tasks:
                - include_vars: global_vars.yaml
-            - hosts: DEPLOY_TARGET_HOST
+{%- for role in roles %}
+            - hosts: {{role.name}}
              name: Run update
-              serial: {{ deploy_serial | default(1) }}
+              serial: {{ role.update_serial | default(1) }}
              gather_facts: no
              any_errors_fatal: yes
              vars:
@ -550,10 +551,8 @@ outputs:
                  with_sequence: start=0 end={{update_steps_max-1}}
                  loop_control:
                    loop_var: step
-{%- for role in roles %}
                - import_tasks: {{role.name}}/host_prep_tasks.yaml
                  when: tripleo_role_name == '{{role.name}}'
-{%- endfor %}
                - include_tasks: common_deploy_steps_tasks.yaml
                  with_sequence: start=1 end={{deploy_steps_max-1}}
                  loop_control:
@ -562,6 +561,7 @@ outputs:
                  with_sequence: start=0 end={{post_update_steps_max-1}}
                  loop_control:
                    loop_var: step
+{%- endfor %}
      external_update_steps_tasks: {get_attr: [ExternalUpdateTasks, value]}
      external_update_steps_playbook:
        str_replace:
@ -630,11 +630,12 @@ outputs:
            DEPLOY_SOURCE_HOST: {get_param: deployment_source_hosts}
            DEPLOY_TARGET_HOST: {get_param: deployment_target_hosts}
          template: |
-            - hosts: DEPLOY_SOURCE_HOST
+{%- for role in roles %}
+            - hosts: {{role.name}}
              name: Gather facts from undercloud
              gather_facts: yes
              become: false
-            - hosts: DEPLOY_TARGET_HOST
+            - hosts: {{role.name}}
              name: Gather facts from overcloud
              gather_facts: yes
            - hosts: all
@ -642,9 +643,9 @@ outputs:
              gather_facts: no
              tasks:
                - include_vars: global_vars.yaml
-            - hosts: DEPLOY_TARGET_HOST
+            - hosts: {{role.name}}
              name: Run pre-upgrade rolling tasks
-              serial: {{ deploy_serial | default(1) }}
+              serial:  {{ role.deploy_serial | default(1) }}
              gather_facts: no
              any_errors_fatal: yes
              tasks:
@ -652,6 +653,7 @@ outputs:
                  with_sequence: start=0 end={{pre_upgrade_rolling_steps_max-1}}
                  loop_control:
                    loop_var: step
+{%- endfor %}
      upgrade_steps_tasks: |
            - name: ensure /var/lib/config-data exists
              file:
--- a/releasenotes/notes/update_serial-785ff794ff88fb2e.yaml
+++ b/releasenotes/notes/update_serial-785ff794ff88fb2e.yaml
@ -0,0 +1,9 @@
+---
+upgrade:
+  - |
+    The new role variable update_serial is introduced
+    allowing parallel update execution. On Controller
+    role this variable defaults to 1 as pacemaker
+    has to be taken down and up in rolling fashion.
+    The default value is 25 as that is default value
+    for parallel ansible execution used by tripleo.
--- a/roles/BlockStorage.yaml
+++ b/roles/BlockStorage.yaml
@ -13,6 +13,7 @@
      subnet: storage_mgmt_subnet
  uses_deprecated_params: False
  deprecated_nic_config_name: 'cinder-storage.yaml'
+  update_serial: 25
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AuditD
--- a/roles/CellController.yaml
+++ b/roles/CellController.yaml
@ -18,6 +18,7 @@
  # each, such as ['ControlPlane', 'External']
  default_route_networks: ['External']
  HostnameFormatDefault: '%stackname%-cellcontrol-%index%'
+  update_serial: 1
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AuditD
--- a/roles/CephAll.yaml
+++ b/roles/CephAll.yaml
@ -10,6 +10,8 @@
    StorageMgmt:
      subnet: storage_mgmt_subnet
  HostnameFormatDefault: '%stackname%-ceph-all-%index%'
+  # CephOSD present so serial has to be 1
+  update_serial: 1
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AuditD
--- a/roles/CephFile.yaml
+++ b/roles/CephFile.yaml
@ -10,6 +10,8 @@
    StorageMgmt:
      subnet: storage_mgmt_subnet
  HostnameFormatDefault: '%stackname%-ceph-file-%index%'
+  # CephOSD present so serial has to be 1
+  update_serial: 1
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AuditD
--- a/roles/CephObject.yaml
+++ b/roles/CephObject.yaml
@ -10,6 +10,8 @@
    StorageMgmt:
      subnet: storage_mgmt_subnet
  HostnameFormatDefault: '%stackname%-ceph-object-%index%'
+  # CephOSD present so serial has to be 1
+  update_serial: 1
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AuditD
--- a/roles/CephStorage.yaml
+++ b/roles/CephStorage.yaml
@ -11,6 +11,8 @@
      subnet: storage_mgmt_subnet
  uses_deprecated_params: False
  deprecated_nic_config_name: 'ceph-storage.yaml'
+  # CephOSD present so serial has to be 1
+  update_serial: 1
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AuditD
--- a/roles/Compute.yaml
+++ b/roles/Compute.yaml
@ -30,6 +30,7 @@
  deprecated_param_ips: 'NovaComputeIPs'
  deprecated_server_resource_name: 'NovaCompute'
  deprecated_nic_config_name: 'compute.yaml'
+  update_serial: 25
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AuditD
--- a/roles/ComputeAlt.yaml
+++ b/roles/ComputeAlt.yaml
@ -16,6 +16,7 @@
  disable_constraints: True
  RoleParametersDefault:
    TunedProfileName: "virtual-host"
+  update_serial: 25
  ServicesDefault:
    - OS::TripleO::Services::AuditD
    - OS::TripleO::Services::BootParams
--- a/roles/ComputeDVR.yaml
+++ b/roles/ComputeDVR.yaml
@ -17,6 +17,7 @@
  HostnameFormatDefault: '%stackname%-novacompute-dvr-%index%'
  RoleParametersDefault:
    TunedProfileName: "virtual-host"
+  update_serial: 25
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AuditD
--- a/roles/ComputeHCI.yaml
+++ b/roles/ComputeHCI.yaml
@ -15,6 +15,8 @@
      subnet: storage_mgmt_subnet
  RoleParametersDefault:
    TunedProfileName: "throughput-performance"
+  # CephOSD present so serial has to be 1
+  update_serial: 1
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AuditD
--- a/roles/ComputeInstanceHA.yaml
+++ b/roles/ComputeInstanceHA.yaml
@ -15,6 +15,7 @@
  HostnameFormatDefault: '%stackname%-novacomputeiha-%index%'
  RoleParametersDefault:
    TunedProfileName: "virtual-host"
+  update_serial: 25
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AuditD
--- a/roles/ComputeLiquidio.yaml
+++ b/roles/ComputeLiquidio.yaml
@ -17,6 +17,7 @@
  HostnameFormatDefault: '%stackname%-lionovacompute-%index%'
  RoleParametersDefault:
    TunedProfileName: "virtual-host"
+  update_serial: 25
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AuditD
--- a/roles/ComputeOvsDpdk.yaml
+++ b/roles/ComputeOvsDpdk.yaml
@ -18,6 +18,7 @@
    TunedProfileName: "cpu-partitioning"
    NovaLibvirtRxQueueSize: 1024
    NovaLibvirtTxQueueSize: 1024
+  update_serial: 25
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AuditD
--- a/roles/ComputeOvsDpdkRT.yaml
+++ b/roles/ComputeOvsDpdkRT.yaml
@ -18,6 +18,7 @@
    TunedProfileName: "realtime-virtual-host"
    NovaLibvirtRxQueueSize: 1024
    NovaLibvirtTxQueueSize: 1024
+  update_serial: 25
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AuditD
--- a/roles/ComputeOvsDpdkSriov.yaml
+++ b/roles/ComputeOvsDpdkSriov.yaml
@ -14,6 +14,7 @@
    TunedProfileName: "cpu-partitioning"
    NovaLibvirtRxQueueSize: 1024
    NovaLibvirtTxQueueSize: 1024
+  update_serial: 25
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AuditD
--- a/roles/ComputeOvsDpdkSriovRT.yaml
+++ b/roles/ComputeOvsDpdkSriovRT.yaml
@ -15,6 +15,7 @@
    TunedProfileName: "realtime-virtual-host"
    NovaLibvirtRxQueueSize: 1024
    NovaLibvirtTxQueueSize: 1024
+  update_serial: 25
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AuditD
--- a/roles/ComputePPC64LE.yaml
+++ b/roles/ComputePPC64LE.yaml
@ -16,6 +16,7 @@
  ImageDefault: ppc64le-overcloud-full
  RoleParametersDefault:
    TunedProfileName: "virtual-host"
+  update_serial: 25
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AuditD
--- a/roles/ComputeRealTime.yaml
+++ b/roles/ComputeRealTime.yaml
@ -22,6 +22,7 @@
    KernelArgs: ""      # these must be set in an environment file or similar
    IsolCpusList: ""    # according to the hardware of real-time nodes
    NovaVcpuPinSet: ""  #
+  update_serial: 25
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AuditD
--- a/roles/ComputeSriov.yaml
+++ b/roles/ComputeSriov.yaml
@ -14,6 +14,7 @@
      subnet: storage_subnet
  RoleParametersDefault:
    TunedProfileName: "cpu-partitioning"
+  update_serial: 25
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AuditD
--- a/roles/ComputeSriovRT.yaml
+++ b/roles/ComputeSriovRT.yaml
@ -15,6 +15,7 @@
  ImageDefault: overcloud-realtime-compute
  RoleParametersDefault:
    TunedProfileName: "realtime-virtual-host"
+  update_serial: 25
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AuditD
--- a/roles/Controller.yaml
+++ b/roles/Controller.yaml
@ -31,6 +31,7 @@
  deprecated_param_flavor: 'OvercloudControlFlavor'
  deprecated_param_image: 'controllerImage'
  deprecated_nic_config_name: 'controller.yaml'
+  update_serial: 1
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AodhApi
--- a/roles/ControllerAllNovaStandalone.yaml
+++ b/roles/ControllerAllNovaStandalone.yaml
@ -22,6 +22,7 @@
      subnet: tenant_subnet
  default_route_networks: ['External']
  HostnameFormatDefault: '%stackname%-controller-%index%'
+  update_serial: 1
  ServicesDefault:
    - OS::TripleO::Services::AodhApi
    - OS::TripleO::Services::AodhEvaluator
--- a/roles/ControllerNoCeph.yaml
+++ b/roles/ControllerNoCeph.yaml
@ -28,6 +28,7 @@
  deprecated_param_extraconfig: 'controllerExtraConfig'
  deprecated_param_flavor: 'OvercloudControlFlavor'
  deprecated_param_image: 'controllerImage'
+  update_serial: 1
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AodhApi
--- a/roles/ControllerNovaStandalone.yaml
+++ b/roles/ControllerNovaStandalone.yaml
@ -21,6 +21,7 @@
      subnet: tenant_subnet
  default_route_networks: ['External']
  HostnameFormatDefault: '%stackname%-controller-%index%'
+  update_serial: 1
  ServicesDefault:
    - OS::TripleO::Services::AodhApi
    - OS::TripleO::Services::AodhEvaluator
--- a/roles/ControllerOpenstack.yaml
+++ b/roles/ControllerOpenstack.yaml
@ -22,6 +22,7 @@
      subnet: tenant_subnet
  default_route_networks: ['External']
  HostnameFormatDefault: '%stackname%-controller-%index%'
+  update_serial: 1
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AodhApi
--- a/roles/ControllerStorageNfs.yaml
+++ b/roles/ControllerStorageNfs.yaml
@ -32,6 +32,7 @@
  deprecated_param_extraconfig: 'controllerExtraConfig'
  deprecated_param_flavor: 'OvercloudControlFlavor'
  deprecated_param_image: 'controllerImage'
+  update_serial: 1
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AodhApi
--- a/roles/Database.yaml
+++ b/roles/Database.yaml
@ -8,6 +8,7 @@
    InternalApi:
      subnet: internal_api_subnet
  HostnameFormatDefault: '%stackname%-database-%index%'
+  update_serial: 1
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AuditD
--- a/roles/DistributedCompute.yaml
+++ b/roles/DistributedCompute.yaml
@ -14,6 +14,7 @@
      subnet: storage_subnet
  RoleParametersDefault:
    TunedProfileName: "virtual-host"
+  update_serial: 25
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AuditD
--- a/roles/DistributedComputeHCI.yaml
+++ b/roles/DistributedComputeHCI.yaml
@ -15,6 +15,8 @@
      subnet: storage_mgmt_subnet
  RoleParametersDefault:
    TunedProfileName: "throughput-performance"
+  # CephOSD present so serial has to be 1
+  update_serial: 1
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AuditD
--- a/roles/HciCephAll.yaml
+++ b/roles/HciCephAll.yaml
@ -16,6 +16,8 @@
  HostnameFormatDefault: '%stackname%-hci-ceph-all-%index%'
  RoleParametersDefault:
    TunedProfileName: "throughput-performance"
+  # CephOSD present so serial has to be 1
+  update_serial: 1
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AuditD
--- a/roles/HciCephFile.yaml
+++ b/roles/HciCephFile.yaml
@ -16,6 +16,8 @@
  HostnameFormatDefault: '%stackname%-hci-ceph-file-%index%'
  RoleParametersDefault:
    TunedProfileName: "throughput-performance"
+  # CephOSD present so serial has to be 1
+  update_serial: 1
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AuditD
--- a/roles/HciCephMon.yaml
+++ b/roles/HciCephMon.yaml
@ -16,6 +16,8 @@
  HostnameFormatDefault: '%stackname%-hci-ceph-mon-%index%'
  RoleParametersDefault:
    TunedProfileName: "throughput-performance"
+  # CephOSD present so serial has to be 1
+  update_serial: 1
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AuditD
--- a/roles/HciCephObject.yaml
+++ b/roles/HciCephObject.yaml
@ -16,6 +16,8 @@
  HostnameFormatDefault: '%stackname%-hci-ceph-object-%index%'
  RoleParametersDefault:
    TunedProfileName: "throughput-performance"
+  # CephOSD present so serial has to be 1
+  update_serial: 1
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AuditD
--- a/roles/IronicConductor.yaml
+++ b/roles/IronicConductor.yaml
@ -10,6 +10,7 @@
    Storage:
      subnet: storage_subnet
  HostnameFormatDefault: '%stackname%-ironic-%index%'
+  update_serial: 25
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AuditD
--- a/roles/Messaging.yaml
+++ b/roles/Messaging.yaml
@ -7,6 +7,7 @@
  networks:
    InternalApi:
      subnet: internal_api_subnet
+  update_serial: 1
  HostnameFormatDefault: '%stackname%-messaging-%index%'
  ServicesDefault:
    - OS::TripleO::Services::Aide
--- a/roles/Networker.yaml
+++ b/roles/Networker.yaml
@ -12,6 +12,7 @@
  tags:
    - external_bridge
  HostnameFormatDefault: '%stackname%-networker-%index%'
+  update_serial: 1
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AuditD
--- a/roles/Novacontrol.yaml
+++ b/roles/Novacontrol.yaml
@ -10,6 +10,7 @@
    Storage:
      subnet: storage_subnet
  HostnameFormatDefault: '%stackname%-novacontrol-%index%'
+  update_serial: 25
  ServicesDefault:
    - OS::TripleO::Services::AuditD
    - OS::TripleO::Services::BootParams
--- a/roles/ObjectStorage.yaml
+++ b/roles/ObjectStorage.yaml
@ -20,6 +20,8 @@
  deprecated_param_flavor: 'OvercloudSwiftStorageFlavor'
  deprecated_nic_config_name: 'swift-storage.yaml'
  deprecated_server_resource_name: 'SwiftStorage'
+  # SwiftStorage present so serial has to be 1
+  update_serial: 1
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AuditD
--- a/roles/OpenShiftAllInOne.yaml
+++ b/roles/OpenShiftAllInOne.yaml
@ -22,6 +22,7 @@
  # For systems with both IPv4 and IPv6, you may specify a gateway network for
  # each, such as ['ControlPlane', 'External']
  default_route_networks: ['External']
+  update_serial: 25
  ServicesDefault:
    - OS::TripleO::Services::BootParams
    - OS::TripleO::Services::Docker
--- a/roles/OpenShiftInfra.yaml
+++ b/roles/OpenShiftInfra.yaml
@ -18,6 +18,7 @@
  # For systems with both IPv4 and IPv6, you may specify a gateway network for
  # each, such as ['ControlPlane', 'External']
  default_route_networks: ['ControlPlane']
+  update_serial: 25
  ServicesDefault:
    - OS::TripleO::Services::BootParams
    - OS::TripleO::Services::Docker
--- a/roles/OpenShiftMaster.yaml
+++ b/roles/OpenShiftMaster.yaml
@ -22,6 +22,7 @@
  # For systems with both IPv4 and IPv6, you may specify a gateway network for
  # each, such as ['ControlPlane', 'External']
  default_route_networks: ['External']
+  update_serial: 25
  ServicesDefault:
    - OS::TripleO::Services::BootParams
    - OS::TripleO::Services::ContainerImagePrepare
--- a/roles/OpenShiftWorker.yaml
+++ b/roles/OpenShiftWorker.yaml
@ -18,6 +18,7 @@
  # For systems with both IPv4 and IPv6, you may specify a gateway network for
  # each, such as ['ControlPlane', 'External']
  default_route_networks: ['ControlPlane']
+  update_serial: 25
  ServicesDefault:
    - OS::TripleO::Services::BootParams
    - OS::TripleO::Services::Docker
--- a/roles/Telemetry.yaml
+++ b/roles/Telemetry.yaml
@ -10,6 +10,7 @@
    Storage:
      subnet: storage_subnet
  HostnameFormatDefault: '%stackname%-telemetry-%index%'
+  update_serial: 1
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AodhApi
--- a/roles_data.yaml
+++ b/roles_data.yaml
@ -34,6 +34,7 @@
  deprecated_param_flavor: 'OvercloudControlFlavor'
  deprecated_param_image: 'controllerImage'
  deprecated_nic_config_name: 'controller.yaml'
+  update_serial: 1
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AodhApi
@ -221,6 +222,7 @@
  deprecated_param_ips: 'NovaComputeIPs'
  deprecated_server_resource_name: 'NovaCompute'
  deprecated_nic_config_name: 'compute.yaml'
+  update_serial: 25
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AuditD
@ -284,6 +286,7 @@
      subnet: storage_mgmt_subnet
  uses_deprecated_params: False
  deprecated_nic_config_name: 'cinder-storage.yaml'
+  update_serial: 25
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AuditD
@ -337,6 +340,8 @@
  deprecated_param_flavor: 'OvercloudSwiftStorageFlavor'
  deprecated_nic_config_name: 'swift-storage.yaml'
  deprecated_server_resource_name: 'SwiftStorage'
+  # SwiftStorage present so serial has to be 1
+  update_serial: 1
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AuditD
@ -381,6 +386,8 @@
      subnet: storage_mgmt_subnet
  uses_deprecated_params: False
  deprecated_nic_config_name: 'ceph-storage.yaml'
+  # CephOSD present so serial has to be 1
+  update_serial: 1
  ServicesDefault:
    - OS::TripleO::Services::Aide
    - OS::TripleO::Services::AuditD