From ab67b737498f511e731e2a2421359427505a9a54 Mon Sep 17 00:00:00 2001 From: Mathieu Bultel Date: Mon, 13 May 2019 15:25:57 +0200 Subject: [PATCH] Force ansible serial to 1 for the Controller By introducing update_serial variable we parallelize update execution on non-pacemaker enabled nodes. Custom role data users need to update their role files. By default we do serial 1 making sure nothing changes for users who didn't update their role data. Resolves: rhbz#1652057 Closes-Bug: #1831617 Change-Id: I4ee0110a6c2b9466d81e37e5df27f5f81a6eceb5 (cherry picked from commit a59a188a6b6ef7275d318d95b17d3a692065e16a) --- common/deploy-steps.j2 | 18 +++++++++--------- .../notes/update_serial-785ff794ff88fb2e.yaml | 9 +++++++++ roles/BlockStorage.yaml | 1 + roles/CephAll.yaml | 2 ++ roles/CephFile.yaml | 2 ++ roles/CephObject.yaml | 2 ++ roles/CephStorage.yaml | 2 ++ roles/Compute.yaml | 1 + roles/ComputeAlt.yaml | 1 + roles/ComputeDVR.yaml | 1 + roles/ComputeHCI.yaml | 2 ++ roles/ComputeInstanceHA.yaml | 1 + roles/ComputeLiquidio.yaml | 1 + roles/ComputeOvsDpdk.yaml | 1 + roles/ComputeOvsDpdkRT.yaml | 1 + roles/ComputeOvsDpdkSriov.yaml | 1 + roles/ComputeOvsDpdkSriovRT.yaml | 1 + roles/ComputePPC64LE.yaml | 1 + roles/ComputeRealTime.yaml | 1 + roles/ComputeSriov.yaml | 1 + roles/ComputeSriovRT.yaml | 1 + roles/Controller.yaml | 1 + roles/ControllerAllNovaStandalone.yaml | 1 + roles/ControllerNoCeph.yaml | 1 + roles/ControllerNovaStandalone.yaml | 1 + roles/ControllerOpenstack.yaml | 1 + roles/ControllerStorageNfs.yaml | 1 + roles/Database.yaml | 1 + roles/HciCephAll.yaml | 2 ++ roles/HciCephFile.yaml | 2 ++ roles/HciCephMon.yaml | 2 ++ roles/HciCephObject.yaml | 2 ++ roles/IronicConductor.yaml | 1 + roles/Messaging.yaml | 1 + roles/Networker.yaml | 1 + roles/Novacontrol.yaml | 1 + roles/ObjectStorage.yaml | 1 + roles/OpenShiftAllInOne.yaml | 1 + roles/OpenShiftInfra.yaml | 1 + roles/OpenShiftMaster.yaml | 1 + roles/OpenShiftWorker.yaml | 1 + roles/Telemetry.yaml | 1 + roles_data.yaml | 6 ++++++ 43 files changed, 73 insertions(+), 9 deletions(-) create mode 100644 releasenotes/notes/update_serial-785ff794ff88fb2e.yaml diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2 index 9d7051e6fc..dbf675a5d6 100644 --- a/common/deploy-steps.j2 +++ b/common/deploy-steps.j2 @@ -616,9 +616,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: @@ -628,10 +629,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: @@ -640,6 +639,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: @@ -708,11 +708,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 @@ -720,9 +721,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: @@ -731,7 +732,6 @@ outputs: loop_control: loop_var: step upgrade_steps_tasks: | -{%- for role in roles %} - import_tasks: {{role.name}}/upgrade_tasks.yaml when: tripleo_role_name == '{{role.name}}' {%- endfor %} diff --git a/releasenotes/notes/update_serial-785ff794ff88fb2e.yaml b/releasenotes/notes/update_serial-785ff794ff88fb2e.yaml new file mode 100644 index 0000000000..6dc46fc215 --- /dev/null +++ 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. diff --git a/roles/BlockStorage.yaml b/roles/BlockStorage.yaml index ce3fe7b0c8..4fc24b12af 100644 --- a/roles/BlockStorage.yaml +++ b/roles/BlockStorage.yaml @@ -10,6 +10,7 @@ - StorageMgmt uses_deprecated_params: False deprecated_nic_config_name: 'cinder-storage.yaml' + update_serial: 25 ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD diff --git a/roles/CephAll.yaml b/roles/CephAll.yaml index d4daccc003..c426b20bfd 100644 --- a/roles/CephAll.yaml +++ b/roles/CephAll.yaml @@ -8,6 +8,8 @@ - Storage - StorageMgmt 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 diff --git a/roles/CephFile.yaml b/roles/CephFile.yaml index 94fb003b0d..e557601f3d 100644 --- a/roles/CephFile.yaml +++ b/roles/CephFile.yaml @@ -8,6 +8,8 @@ - Storage - StorageMgmt 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 diff --git a/roles/CephObject.yaml b/roles/CephObject.yaml index 7919658436..77b9cd44f4 100644 --- a/roles/CephObject.yaml +++ b/roles/CephObject.yaml @@ -8,6 +8,8 @@ - Storage - StorageMgmt 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 diff --git a/roles/CephStorage.yaml b/roles/CephStorage.yaml index 9d7bbe098e..591a6f9fa7 100644 --- a/roles/CephStorage.yaml +++ b/roles/CephStorage.yaml @@ -9,6 +9,8 @@ - StorageMgmt 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 diff --git a/roles/Compute.yaml b/roles/Compute.yaml index 7365fdbc85..31ba68a475 100644 --- a/roles/Compute.yaml +++ b/roles/Compute.yaml @@ -22,6 +22,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 diff --git a/roles/ComputeAlt.yaml b/roles/ComputeAlt.yaml index 706f7f93d0..a6a776aee1 100644 --- a/roles/ComputeAlt.yaml +++ b/roles/ComputeAlt.yaml @@ -13,6 +13,7 @@ disable_constraints: True RoleParametersDefault: TunedProfileName: "virtual-host" + update_serial: 25 ServicesDefault: - OS::TripleO::Services::AuditD - OS::TripleO::Services::CACerts diff --git a/roles/ComputeDVR.yaml b/roles/ComputeDVR.yaml index 791329ca51..2c6b03624b 100644 --- a/roles/ComputeDVR.yaml +++ b/roles/ComputeDVR.yaml @@ -13,6 +13,7 @@ HostnameFormatDefault: '%stackname%-novacompute-dvr-%index%' RoleParametersDefault: TunedProfileName: "virtual-host" + update_serial: 25 ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD diff --git a/roles/ComputeHCI.yaml b/roles/ComputeHCI.yaml index 41966b22a4..5a771ea3d0 100644 --- a/roles/ComputeHCI.yaml +++ b/roles/ComputeHCI.yaml @@ -11,6 +11,8 @@ - StorageMgmt RoleParametersDefault: TunedProfileName: "throughput-performance" + # CephOSD present so serial has to be 1 + update_serial: 1 ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD diff --git a/roles/ComputeInstanceHA.yaml b/roles/ComputeInstanceHA.yaml index 9057818f55..08065308a2 100644 --- a/roles/ComputeInstanceHA.yaml +++ b/roles/ComputeInstanceHA.yaml @@ -12,6 +12,7 @@ HostnameFormatDefault: '%stackname%-novacomputeiha-%index%' RoleParametersDefault: TunedProfileName: "virtual-host" + update_serial: 25 ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD diff --git a/roles/ComputeLiquidio.yaml b/roles/ComputeLiquidio.yaml index fa58ce3af5..fce817a681 100644 --- a/roles/ComputeLiquidio.yaml +++ b/roles/ComputeLiquidio.yaml @@ -14,6 +14,7 @@ HostnameFormatDefault: '%stackname%-lionovacompute-%index%' RoleParametersDefault: TunedProfileName: "virtual-host" + update_serial: 25 ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD diff --git a/roles/ComputeOvsDpdk.yaml b/roles/ComputeOvsDpdk.yaml index 771e67a3de..6994044c3a 100644 --- a/roles/ComputeOvsDpdk.yaml +++ b/roles/ComputeOvsDpdk.yaml @@ -15,6 +15,7 @@ TunedProfileName: "cpu-partitioning" NovaLibvirtRxQueueSize: 1024 NovaLibvirtTxQueueSize: 1024 + update_serial: 25 ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD diff --git a/roles/ComputeOvsDpdkRT.yaml b/roles/ComputeOvsDpdkRT.yaml index 5c940b4304..da6e36efa1 100644 --- a/roles/ComputeOvsDpdkRT.yaml +++ b/roles/ComputeOvsDpdkRT.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 diff --git a/roles/ComputeOvsDpdkSriov.yaml b/roles/ComputeOvsDpdkSriov.yaml index 1043a8e330..b98c4310db 100644 --- 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 diff --git a/roles/ComputeOvsDpdkSriovRT.yaml b/roles/ComputeOvsDpdkSriovRT.yaml index 251f9e0984..46cd90baa6 100644 --- 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 diff --git a/roles/ComputePPC64LE.yaml b/roles/ComputePPC64LE.yaml index fc313e8026..d5674994ba 100644 --- a/roles/ComputePPC64LE.yaml +++ b/roles/ComputePPC64LE.yaml @@ -13,6 +13,7 @@ ImageDefault: ppc64le-overcloud-full RoleParametersDefault: TunedProfileName: "virtual-host" + update_serial: 25 ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD diff --git a/roles/ComputeRealTime.yaml b/roles/ComputeRealTime.yaml index 95b7638bb5..33c7ca1c3d 100644 --- a/roles/ComputeRealTime.yaml +++ b/roles/ComputeRealTime.yaml @@ -19,6 +19,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 diff --git a/roles/ComputeSriov.yaml b/roles/ComputeSriov.yaml index 8c9ffd177c..8ee839fda7 100644 --- a/roles/ComputeSriov.yaml +++ b/roles/ComputeSriov.yaml @@ -11,6 +11,7 @@ - Storage RoleParametersDefault: TunedProfileName: "cpu-partitioning" + update_serial: 25 ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD diff --git a/roles/ComputeSriovRT.yaml b/roles/ComputeSriovRT.yaml index 00ba52f647..b1a4ff6bc4 100644 --- a/roles/ComputeSriovRT.yaml +++ b/roles/ComputeSriovRT.yaml @@ -12,6 +12,7 @@ ImageDefault: overcloud-realtime-compute RoleParametersDefault: TunedProfileName: "realtime-virtual-host" + update_serial: 25 ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD diff --git a/roles/Controller.yaml b/roles/Controller.yaml index 968206bbac..9d2a883bea 100644 --- a/roles/Controller.yaml +++ b/roles/Controller.yaml @@ -26,6 +26,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 diff --git a/roles/ControllerAllNovaStandalone.yaml b/roles/ControllerAllNovaStandalone.yaml index d9ef4e3d47..40ac04386f 100644 --- a/roles/ControllerAllNovaStandalone.yaml +++ b/roles/ControllerAllNovaStandalone.yaml @@ -17,6 +17,7 @@ - Tenant default_route_networks: ['External'] HostnameFormatDefault: '%stackname%-controller-%index%' + update_serial: 1 ServicesDefault: - OS::TripleO::Services::AodhApi - OS::TripleO::Services::AodhEvaluator diff --git a/roles/ControllerNoCeph.yaml b/roles/ControllerNoCeph.yaml index 36d1db4574..fb480bf761 100644 --- a/roles/ControllerNoCeph.yaml +++ b/roles/ControllerNoCeph.yaml @@ -23,6 +23,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 diff --git a/roles/ControllerNovaStandalone.yaml b/roles/ControllerNovaStandalone.yaml index 7fd1bcba30..93bc833160 100644 --- a/roles/ControllerNovaStandalone.yaml +++ b/roles/ControllerNovaStandalone.yaml @@ -16,6 +16,7 @@ - Tenant default_route_networks: ['External'] HostnameFormatDefault: '%stackname%-controller-%index%' + update_serial: 1 ServicesDefault: - OS::TripleO::Services::AodhApi - OS::TripleO::Services::AodhEvaluator diff --git a/roles/ControllerOpenstack.yaml b/roles/ControllerOpenstack.yaml index 2c8ee0737a..73d6c4f1f3 100644 --- a/roles/ControllerOpenstack.yaml +++ b/roles/ControllerOpenstack.yaml @@ -17,6 +17,7 @@ - Tenant default_route_networks: ['External'] HostnameFormatDefault: '%stackname%-controller-%index%' + update_serial: 1 ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AodhApi diff --git a/roles/ControllerStorageNfs.yaml b/roles/ControllerStorageNfs.yaml index b993799f04..677f501100 100644 --- a/roles/ControllerStorageNfs.yaml +++ b/roles/ControllerStorageNfs.yaml @@ -26,6 +26,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 diff --git a/roles/Database.yaml b/roles/Database.yaml index 9ff0c701fe..f96c7af7b4 100644 --- a/roles/Database.yaml +++ b/roles/Database.yaml @@ -7,6 +7,7 @@ networks: - InternalApi HostnameFormatDefault: '%stackname%-database-%index%' + update_serial: 1 ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD diff --git a/roles/HciCephAll.yaml b/roles/HciCephAll.yaml index 84326306e3..a4bf4540d6 100644 --- a/roles/HciCephAll.yaml +++ b/roles/HciCephAll.yaml @@ -12,6 +12,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 diff --git a/roles/HciCephFile.yaml b/roles/HciCephFile.yaml index 7264f2c831..16b378f3ad 100644 --- a/roles/HciCephFile.yaml +++ b/roles/HciCephFile.yaml @@ -12,6 +12,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 diff --git a/roles/HciCephMon.yaml b/roles/HciCephMon.yaml index 4c8343ea8c..ff4b9f9bcf 100644 --- a/roles/HciCephMon.yaml +++ b/roles/HciCephMon.yaml @@ -12,6 +12,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 diff --git a/roles/HciCephObject.yaml b/roles/HciCephObject.yaml index 9be22ea4e6..159a53eb74 100644 --- a/roles/HciCephObject.yaml +++ b/roles/HciCephObject.yaml @@ -12,6 +12,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 diff --git a/roles/IronicConductor.yaml b/roles/IronicConductor.yaml index 6f6024c34d..827045a48e 100644 --- a/roles/IronicConductor.yaml +++ b/roles/IronicConductor.yaml @@ -8,6 +8,7 @@ - InternalApi - Storage HostnameFormatDefault: '%stackname%-ironic-%index%' + update_serial: 25 ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD diff --git a/roles/Messaging.yaml b/roles/Messaging.yaml index cd888ece86..9db6f7927d 100644 --- a/roles/Messaging.yaml +++ b/roles/Messaging.yaml @@ -6,6 +6,7 @@ Standalone messaging role with backends being managed via Pacemaker networks: - InternalApi + update_serial: 1 HostnameFormatDefault: '%stackname%-messaging-%index%' ServicesDefault: - OS::TripleO::Services::Aide diff --git a/roles/Networker.yaml b/roles/Networker.yaml index 1ffe814b72..2308a1500f 100644 --- a/roles/Networker.yaml +++ b/roles/Networker.yaml @@ -8,6 +8,7 @@ - InternalApi - Tenant HostnameFormatDefault: '%stackname%-networker-%index%' + update_serial: 1 ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD diff --git a/roles/Novacontrol.yaml b/roles/Novacontrol.yaml index dc08c3d437..2ce9a77c7e 100644 --- a/roles/Novacontrol.yaml +++ b/roles/Novacontrol.yaml @@ -8,6 +8,7 @@ - InternalApi - Storage HostnameFormatDefault: '%stackname%-novacontrol-%index%' + update_serial: 25 ServicesDefault: - OS::TripleO::Services::AuditD - OS::TripleO::Services::CACerts diff --git a/roles/ObjectStorage.yaml b/roles/ObjectStorage.yaml index 9ef94b5eb6..b9d5becce5 100644 --- a/roles/ObjectStorage.yaml +++ b/roles/ObjectStorage.yaml @@ -16,6 +16,7 @@ deprecated_param_image: 'SwiftStorageImage' deprecated_param_flavor: 'OvercloudSwiftStorageFlavor' deprecated_nic_config_name: 'swift-storage.yaml' + update_serial: 1 ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD diff --git a/roles/OpenShiftAllInOne.yaml b/roles/OpenShiftAllInOne.yaml index 4840b65ddc..a2ccbebdab 100644 --- a/roles/OpenShiftAllInOne.yaml +++ b/roles/OpenShiftAllInOne.yaml @@ -19,6 +19,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::Docker - OS::TripleO::Services::Ntp diff --git a/roles/OpenShiftInfra.yaml b/roles/OpenShiftInfra.yaml index 4a7731b638..0720e194bc 100644 --- a/roles/OpenShiftInfra.yaml +++ b/roles/OpenShiftInfra.yaml @@ -16,6 +16,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::Docker - OS::TripleO::Services::Ntp diff --git a/roles/OpenShiftMaster.yaml b/roles/OpenShiftMaster.yaml index 5b9f3ab07b..f7011d4e6e 100644 --- a/roles/OpenShiftMaster.yaml +++ b/roles/OpenShiftMaster.yaml @@ -19,6 +19,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::ContainerImagePrepare - OS::TripleO::Services::Docker diff --git a/roles/OpenShiftWorker.yaml b/roles/OpenShiftWorker.yaml index a7b7ce92b0..0fdc4e25b2 100644 --- a/roles/OpenShiftWorker.yaml +++ b/roles/OpenShiftWorker.yaml @@ -16,6 +16,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::Docker - OS::TripleO::Services::Ntp diff --git a/roles/Telemetry.yaml b/roles/Telemetry.yaml index 901f710726..78333e50f1 100644 --- a/roles/Telemetry.yaml +++ b/roles/Telemetry.yaml @@ -8,6 +8,7 @@ - InternalApi - Storage HostnameFormatDefault: '%stackname%-telemetry-%index%' + update_serial: 1 ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AodhApi diff --git a/roles_data.yaml b/roles_data.yaml index 565162c0e8..2dc956c6f0 100644 --- a/roles_data.yaml +++ b/roles_data.yaml @@ -29,6 +29,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 @@ -210,6 +211,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 @@ -269,6 +271,7 @@ - StorageMgmt uses_deprecated_params: False deprecated_nic_config_name: 'cinder-storage.yaml' + update_serial: 25 ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD @@ -317,6 +320,7 @@ deprecated_param_image: 'SwiftStorageImage' deprecated_param_flavor: 'OvercloudSwiftStorageFlavor' deprecated_nic_config_name: 'swift-storage.yaml' + update_serial: 1 ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD @@ -357,6 +361,8 @@ - StorageMgmt 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