From 45c226c8fe9e0da6f62841608a2c635d7eec8ad8 Mon Sep 17 00:00:00 2001 From: James Slagle Date: Fri, 4 Oct 2019 12:17:31 -0400 Subject: [PATCH] Add NovaAZConfig service to compute roles The NovaAZConfig service is added to all the compute related roles of the box so that the nodes are automatically in a new AZ when the service is enabled. By default, the service is mapped to OS::Heat::None so no change in default behavior is made. Change-Id: If1e4e149100dccfe76ccd807997a611d0fc8841f --- environments/hyperconverged-ceph.yaml | 1 + roles/Compute.yaml | 1 + roles/ComputeAlt.yaml | 1 + roles/ComputeDVR.yaml | 1 + roles/ComputeHCI.yaml | 1 + roles/ComputeHCIOvsDpdk.yaml | 1 + roles/ComputeInstanceHA.yaml | 1 + roles/ComputeLiquidio.yaml | 1 + roles/ComputeLocalEphemeral.yaml | 1 + roles/ComputeOvsDpdk.yaml | 1 + roles/ComputeOvsDpdkRT.yaml | 1 + roles/ComputeOvsDpdkSriov.yaml | 1 + roles/ComputeOvsDpdkSriovRT.yaml | 1 + roles/ComputePPC64LE.yaml | 1 + roles/ComputeRBDEphemeral.yaml | 1 + roles/ComputeRealTime.yaml | 1 + roles/ComputeSriov.yaml | 1 + roles/ComputeSriovRT.yaml | 1 + roles/DistributedCompute.yaml | 1 + roles/DistributedComputeHCI.yaml | 1 + roles/HciCephAll.yaml | 1 + roles/HciCephFile.yaml | 1 + roles/HciCephMon.yaml | 1 + roles/HciCephObject.yaml | 1 + roles_data.yaml | 2 ++ roles_data_undercloud.yaml | 1 + 26 files changed, 27 insertions(+) diff --git a/environments/hyperconverged-ceph.yaml b/environments/hyperconverged-ceph.yaml index b6cb7f97d0..78cdf34ad9 100644 --- a/environments/hyperconverged-ceph.yaml +++ b/environments/hyperconverged-ceph.yaml @@ -27,6 +27,7 @@ parameter_defaults: - OS::TripleO::Services::Sshd - OS::TripleO::Services::Securetty - OS::TripleO::Services::NeutronBgpVpnBagpipe + - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt - OS::TripleO::Services::NovaLibvirtGuests diff --git a/roles/Compute.yaml b/roles/Compute.yaml index aa81d1c36e..1938fd2e08 100644 --- a/roles/Compute.yaml +++ b/roles/Compute.yaml @@ -57,6 +57,7 @@ - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronVppAgent + - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt - OS::TripleO::Services::NovaLibvirtGuests diff --git a/roles/ComputeAlt.yaml b/roles/ComputeAlt.yaml index 1ea000b2ef..c71c5abed1 100644 --- a/roles/ComputeAlt.yaml +++ b/roles/ComputeAlt.yaml @@ -36,6 +36,7 @@ - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronVppAgent + - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaComputeAlt - OS::TripleO::Services::NovaLibvirtAlt - OS::TripleO::Services::NovaMigrationTargetAlt diff --git a/roles/ComputeDVR.yaml b/roles/ComputeDVR.yaml index e2c67ea797..3cc3dc7f9d 100644 --- a/roles/ComputeDVR.yaml +++ b/roles/ComputeDVR.yaml @@ -44,6 +44,7 @@ - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronVppAgent + - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt - OS::TripleO::Services::NovaLibvirtGuests diff --git a/roles/ComputeHCI.yaml b/roles/ComputeHCI.yaml index bc0291d119..dadf9b6d2f 100644 --- a/roles/ComputeHCI.yaml +++ b/roles/ComputeHCI.yaml @@ -44,6 +44,7 @@ - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronVppAgent + - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt - OS::TripleO::Services::NovaLibvirtGuests diff --git a/roles/ComputeHCIOvsDpdk.yaml b/roles/ComputeHCIOvsDpdk.yaml index 0917ecc84a..fae99b6f3e 100644 --- a/roles/ComputeHCIOvsDpdk.yaml +++ b/roles/ComputeHCIOvsDpdk.yaml @@ -45,6 +45,7 @@ - OS::TripleO::Services::Multipathd - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::NeutronBgpVpnBagpipe + - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt - OS::TripleO::Services::NovaLibvirtGuests diff --git a/roles/ComputeInstanceHA.yaml b/roles/ComputeInstanceHA.yaml index 9f629164ad..eb0dfaab8e 100644 --- a/roles/ComputeInstanceHA.yaml +++ b/roles/ComputeInstanceHA.yaml @@ -43,6 +43,7 @@ - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronVppAgent + - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt - OS::TripleO::Services::NovaLibvirtGuests diff --git a/roles/ComputeLiquidio.yaml b/roles/ComputeLiquidio.yaml index e0aba14557..606cd3c33a 100644 --- a/roles/ComputeLiquidio.yaml +++ b/roles/ComputeLiquidio.yaml @@ -44,6 +44,7 @@ - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronVppAgent + - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt - OS::TripleO::Services::NovaLibvirtGuests diff --git a/roles/ComputeLocalEphemeral.yaml b/roles/ComputeLocalEphemeral.yaml index 92defe8cd6..066478fe64 100644 --- a/roles/ComputeLocalEphemeral.yaml +++ b/roles/ComputeLocalEphemeral.yaml @@ -46,6 +46,7 @@ - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronVppAgent + - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt - OS::TripleO::Services::NovaLibvirtGuests diff --git a/roles/ComputeOvsDpdk.yaml b/roles/ComputeOvsDpdk.yaml index 17f6471e12..62aef1c507 100644 --- a/roles/ComputeOvsDpdk.yaml +++ b/roles/ComputeOvsDpdk.yaml @@ -43,6 +43,7 @@ - OS::TripleO::Services::Multipathd - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::NeutronBgpVpnBagpipe + - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt - OS::TripleO::Services::NovaLibvirtGuests diff --git a/roles/ComputeOvsDpdkRT.yaml b/roles/ComputeOvsDpdkRT.yaml index 6e8fc5b322..8fc4e480c1 100644 --- a/roles/ComputeOvsDpdkRT.yaml +++ b/roles/ComputeOvsDpdkRT.yaml @@ -44,6 +44,7 @@ - OS::TripleO::Services::Multipathd - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::NeutronBgpVpnBagpipe + - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt - OS::TripleO::Services::NovaLibvirtGuests diff --git a/roles/ComputeOvsDpdkSriov.yaml b/roles/ComputeOvsDpdkSriov.yaml index e8e5788057..463eb0db7e 100644 --- a/roles/ComputeOvsDpdkSriov.yaml +++ b/roles/ComputeOvsDpdkSriov.yaml @@ -41,6 +41,7 @@ - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronSriovAgent - OS::TripleO::Services::NeutronSriovHostConfig + - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt - OS::TripleO::Services::NovaLibvirtGuests diff --git a/roles/ComputeOvsDpdkSriovRT.yaml b/roles/ComputeOvsDpdkSriovRT.yaml index 9eb1498860..c8eb1219e1 100644 --- a/roles/ComputeOvsDpdkSriovRT.yaml +++ b/roles/ComputeOvsDpdkSriovRT.yaml @@ -43,6 +43,7 @@ - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronSriovAgent - OS::TripleO::Services::NeutronSriovHostConfig + - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt - OS::TripleO::Services::NovaLibvirtGuests diff --git a/roles/ComputePPC64LE.yaml b/roles/ComputePPC64LE.yaml index b0f8dc47aa..1d0383e816 100644 --- a/roles/ComputePPC64LE.yaml +++ b/roles/ComputePPC64LE.yaml @@ -43,6 +43,7 @@ - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronVppAgent + - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt - OS::TripleO::Services::NovaLibvirtGuests diff --git a/roles/ComputeRBDEphemeral.yaml b/roles/ComputeRBDEphemeral.yaml index 9c4e00d478..f61f2b5e7b 100644 --- a/roles/ComputeRBDEphemeral.yaml +++ b/roles/ComputeRBDEphemeral.yaml @@ -46,6 +46,7 @@ - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronVppAgent + - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt - OS::TripleO::Services::NovaLibvirtGuests diff --git a/roles/ComputeRealTime.yaml b/roles/ComputeRealTime.yaml index 41b3ef67cd..95224636f4 100644 --- a/roles/ComputeRealTime.yaml +++ b/roles/ComputeRealTime.yaml @@ -50,6 +50,7 @@ - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronVppAgent + - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt - OS::TripleO::Services::NovaLibvirtGuests diff --git a/roles/ComputeSriov.yaml b/roles/ComputeSriov.yaml index e50d029ef2..902cb3134b 100644 --- a/roles/ComputeSriov.yaml +++ b/roles/ComputeSriov.yaml @@ -43,6 +43,7 @@ - OS::TripleO::Services::NeutronSriovHostConfig - OS::TripleO::Services::NeutronMlnxAgent - OS::TripleO::Services::NeutronVppAgent + - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt - OS::TripleO::Services::NovaLibvirtGuests diff --git a/roles/ComputeSriovRT.yaml b/roles/ComputeSriovRT.yaml index 06617e0abf..48c84279ad 100644 --- a/roles/ComputeSriovRT.yaml +++ b/roles/ComputeSriovRT.yaml @@ -44,6 +44,7 @@ - OS::TripleO::Services::NeutronSriovAgent - OS::TripleO::Services::NeutronSriovHostConfig - OS::TripleO::Services::NeutronVppAgent + - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt - OS::TripleO::Services::NovaLibvirtGuests diff --git a/roles/DistributedCompute.yaml b/roles/DistributedCompute.yaml index 5076f169ad..a205ba894e 100644 --- a/roles/DistributedCompute.yaml +++ b/roles/DistributedCompute.yaml @@ -43,6 +43,7 @@ - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronVppAgent + - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt - OS::TripleO::Services::NovaLibvirtGuests diff --git a/roles/DistributedComputeHCI.yaml b/roles/DistributedComputeHCI.yaml index aa31d725e6..855c8e10dc 100644 --- a/roles/DistributedComputeHCI.yaml +++ b/roles/DistributedComputeHCI.yaml @@ -51,6 +51,7 @@ - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronVppAgent + - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt - OS::TripleO::Services::NovaLibvirtGuests diff --git a/roles/HciCephAll.yaml b/roles/HciCephAll.yaml index c2f76a0e14..0fb0008ca8 100644 --- a/roles/HciCephAll.yaml +++ b/roles/HciCephAll.yaml @@ -51,6 +51,7 @@ - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronVppAgent + - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt - OS::TripleO::Services::NovaLibvirtGuests diff --git a/roles/HciCephFile.yaml b/roles/HciCephFile.yaml index 96d26cb0dd..4db77204cd 100644 --- a/roles/HciCephFile.yaml +++ b/roles/HciCephFile.yaml @@ -46,6 +46,7 @@ - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronVppAgent + - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt - OS::TripleO::Services::NovaLibvirtGuests diff --git a/roles/HciCephMon.yaml b/roles/HciCephMon.yaml index 04164432a6..6290337962 100644 --- a/roles/HciCephMon.yaml +++ b/roles/HciCephMon.yaml @@ -47,6 +47,7 @@ - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronVppAgent + - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt - OS::TripleO::Services::NovaLibvirtGuests diff --git a/roles/HciCephObject.yaml b/roles/HciCephObject.yaml index e2048f3ac8..293388553d 100644 --- a/roles/HciCephObject.yaml +++ b/roles/HciCephObject.yaml @@ -46,6 +46,7 @@ - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronVppAgent + - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt - OS::TripleO::Services::NovaLibvirtGuests diff --git a/roles_data.yaml b/roles_data.yaml index 5b55a5bcf0..8b7021ba34 100644 --- a/roles_data.yaml +++ b/roles_data.yaml @@ -248,6 +248,7 @@ - OS::TripleO::Services::NeutronBgpVpnBagpipe - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronVppAgent + - OS::TripleO::Services::NovaAZConfig - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt - OS::TripleO::Services::NovaLibvirtGuests @@ -418,3 +419,4 @@ - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::Tuned + diff --git a/roles_data_undercloud.yaml b/roles_data_undercloud.yaml index 09e500105d..18d8a34fb6 100644 --- a/roles_data_undercloud.yaml +++ b/roles_data_undercloud.yaml @@ -95,3 +95,4 @@ - OS::TripleO::Services::UndercloudUpgrade - OS::TripleO::Services::TripleoValidations - OS::TripleO::Services::Zaqar +