From 0339c45d99550a60c8b1df40d9907169b1870053 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/CellController.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/DistributedCompute.yaml | 1 + roles/DistributedComputeHCI.yaml | 2 ++ 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 | 2 ++ roles/OpenShiftAllInOne.yaml | 1 + roles/OpenShiftInfra.yaml | 1 + roles/OpenShiftMaster.yaml | 1 + roles/OpenShiftWorker.yaml | 1 + roles/Telemetry.yaml | 1 + roles_data.yaml | 7 +++++++ 46 files changed, 80 insertions(+), 8 deletions(-) create mode 100644 releasenotes/notes/update_serial-785ff794ff88fb2e.yaml diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2 index 18174acae3..cc9430a6c7 100644 --- 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: 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 1156f1a5d7..378bb16666 100644 --- 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 diff --git a/roles/CellController.yaml b/roles/CellController.yaml index eb0619ae19..93de0a7121 100644 --- 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 diff --git a/roles/CephAll.yaml b/roles/CephAll.yaml index 1b39af1cf3..ef8addfdf2 100644 --- 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 diff --git a/roles/CephFile.yaml b/roles/CephFile.yaml index 7b5bb84ab7..d1dbcaf315 100644 --- 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 diff --git a/roles/CephObject.yaml b/roles/CephObject.yaml index e68bb69f6a..c8d8171a9e 100644 --- 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 diff --git a/roles/CephStorage.yaml b/roles/CephStorage.yaml index 81a229be33..ea4fe39ccf 100644 --- 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 diff --git a/roles/Compute.yaml b/roles/Compute.yaml index 192c5b4ee3..9cddebc6bb 100644 --- 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 diff --git a/roles/ComputeAlt.yaml b/roles/ComputeAlt.yaml index bb0bc99cc5..863f7aa800 100644 --- 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 diff --git a/roles/ComputeDVR.yaml b/roles/ComputeDVR.yaml index 046fec933d..7bfde7b8ab 100644 --- 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 diff --git a/roles/ComputeHCI.yaml b/roles/ComputeHCI.yaml index 383e4acf65..6811e5e257 100644 --- 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 diff --git a/roles/ComputeInstanceHA.yaml b/roles/ComputeInstanceHA.yaml index cfef237ba8..6118690a3c 100644 --- 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 diff --git a/roles/ComputeLiquidio.yaml b/roles/ComputeLiquidio.yaml index a013966f4f..4ca1f93529 100644 --- 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 diff --git a/roles/ComputeOvsDpdk.yaml b/roles/ComputeOvsDpdk.yaml index b41d223dae..83fa10069f 100644 --- 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 diff --git a/roles/ComputeOvsDpdkRT.yaml b/roles/ComputeOvsDpdkRT.yaml index 8f7fe215e8..7ae703e43d 100644 --- 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 diff --git a/roles/ComputeOvsDpdkSriov.yaml b/roles/ComputeOvsDpdkSriov.yaml index f4293f6347..6d86a30892 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 0211421079..e865eaaacc 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 c4670e8f2d..1c960e17c6 100644 --- 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 diff --git a/roles/ComputeRealTime.yaml b/roles/ComputeRealTime.yaml index e6e33044c9..78ff0e9420 100644 --- 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 diff --git a/roles/ComputeSriov.yaml b/roles/ComputeSriov.yaml index 5329525bff..5302ce320c 100644 --- 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 diff --git a/roles/ComputeSriovRT.yaml b/roles/ComputeSriovRT.yaml index 78852f7ab9..f22ceeb8a4 100644 --- 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 diff --git a/roles/Controller.yaml b/roles/Controller.yaml index 37d0afa600..1e66672d42 100644 --- 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 diff --git a/roles/ControllerAllNovaStandalone.yaml b/roles/ControllerAllNovaStandalone.yaml index 46fc64dbcc..7533afdce5 100644 --- 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 diff --git a/roles/ControllerNoCeph.yaml b/roles/ControllerNoCeph.yaml index 0c7c72e384..6b52f6fdf7 100644 --- 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 diff --git a/roles/ControllerNovaStandalone.yaml b/roles/ControllerNovaStandalone.yaml index d094280316..ae32f08bad 100644 --- 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 diff --git a/roles/ControllerOpenstack.yaml b/roles/ControllerOpenstack.yaml index 697e341274..c09aab1b4e 100644 --- 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 diff --git a/roles/ControllerStorageNfs.yaml b/roles/ControllerStorageNfs.yaml index a7b8a94fe5..4983453fd8 100644 --- 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 diff --git a/roles/Database.yaml b/roles/Database.yaml index d17b005a65..ffeef5c66f 100644 --- 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 diff --git a/roles/DistributedCompute.yaml b/roles/DistributedCompute.yaml index 2c332d5f51..599a6e27e0 100644 --- 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 diff --git a/roles/DistributedComputeHCI.yaml b/roles/DistributedComputeHCI.yaml index 71f378e343..5004982cc7 100644 --- 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 diff --git a/roles/HciCephAll.yaml b/roles/HciCephAll.yaml index c61c5554ac..392f88c1dd 100644 --- 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 diff --git a/roles/HciCephFile.yaml b/roles/HciCephFile.yaml index 9652c0ccc5..1ce343b6f3 100644 --- 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 diff --git a/roles/HciCephMon.yaml b/roles/HciCephMon.yaml index 6d3a0cb6ad..897bf9358a 100644 --- 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 diff --git a/roles/HciCephObject.yaml b/roles/HciCephObject.yaml index ec2703807b..6d550a3f0b 100644 --- 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 diff --git a/roles/IronicConductor.yaml b/roles/IronicConductor.yaml index 5a4c131b72..605e1ec726 100644 --- 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 diff --git a/roles/Messaging.yaml b/roles/Messaging.yaml index 2ddebbc450..3ba7fdea67 100644 --- 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 diff --git a/roles/Networker.yaml b/roles/Networker.yaml index 8ee1554af8..ee029148f2 100644 --- 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 diff --git a/roles/Novacontrol.yaml b/roles/Novacontrol.yaml index 9f69fad831..bda408a5a3 100644 --- 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 diff --git a/roles/ObjectStorage.yaml b/roles/ObjectStorage.yaml index bf65f39cea..292a7edf98 100644 --- 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 diff --git a/roles/OpenShiftAllInOne.yaml b/roles/OpenShiftAllInOne.yaml index f3e4919a51..ef66db52fb 100644 --- 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 diff --git a/roles/OpenShiftInfra.yaml b/roles/OpenShiftInfra.yaml index 6569aa6c35..42d7197a18 100644 --- 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 diff --git a/roles/OpenShiftMaster.yaml b/roles/OpenShiftMaster.yaml index a657ec87d3..158589230b 100644 --- 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 diff --git a/roles/OpenShiftWorker.yaml b/roles/OpenShiftWorker.yaml index 572010d188..9c453c152a 100644 --- 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 diff --git a/roles/Telemetry.yaml b/roles/Telemetry.yaml index 0e78b1ae87..214024cabd 100644 --- 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 diff --git a/roles_data.yaml b/roles_data.yaml index 32011d26a0..504f12cf83 100644 --- 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