From 512c032a0b5873564ebf6906f76e15df5242b3b5 Mon Sep 17 00:00:00 2001 From: karthik s Date: Wed, 14 Nov 2018 17:48:21 +0530 Subject: [PATCH] Add bootparams service for all roles NIC partitioning requires IOMMU to be enabled on roles using it. By adding the BootParams service to all the roles, we could enable IOMMU selectively by supplying the role specific parameter "KernelArgs". If a role doesn't use NIC Partitioning then "KernelArgs" shall be not be set and backward compatibility would be retained. Change-Id: I2eb078d9860d9a46d6bffd0fe2f799298538bf73 --- environments/hyperconverged-ceph.yaml | 1 + roles/BlockStorage.yaml | 1 + roles/CephAll.yaml | 1 + roles/CephFile.yaml | 1 + roles/CephObject.yaml | 1 + roles/CephStorage.yaml | 1 + roles/Compute.yaml | 1 + roles/ComputeAlt.yaml | 1 + roles/ComputeDVR.yaml | 1 + roles/ComputeHCI.yaml | 1 + roles/ComputeInstanceHA.yaml | 1 + roles/ComputeLiquidio.yaml | 1 + roles/ComputePPC64LE.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 | 1 + roles/HciCephFile.yaml | 1 + roles/HciCephMon.yaml | 1 + roles/HciCephObject.yaml | 1 + 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 | 5 +++++ 35 files changed, 39 insertions(+) diff --git a/environments/hyperconverged-ceph.yaml b/environments/hyperconverged-ceph.yaml index c6b33602c9..71f81eae5f 100644 --- a/environments/hyperconverged-ceph.yaml +++ b/environments/hyperconverged-ceph.yaml @@ -15,6 +15,7 @@ resource_registry: parameter_defaults: ComputeServices: - OS::TripleO::Services::Aide + - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::CephClient diff --git a/roles/BlockStorage.yaml b/roles/BlockStorage.yaml index cf4a845583..1348d0ab89 100644 --- a/roles/BlockStorage.yaml +++ b/roles/BlockStorage.yaml @@ -14,6 +14,7 @@ - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD - OS::TripleO::Services::BlockStorageCinderVolume + - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::CinderBackendVRTSHyperScale diff --git a/roles/CephAll.yaml b/roles/CephAll.yaml index a8cb95f7c8..cda47655c2 100644 --- a/roles/CephAll.yaml +++ b/roles/CephAll.yaml @@ -11,6 +11,7 @@ ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD + - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CephMds - OS::TripleO::Services::CephMgr diff --git a/roles/CephFile.yaml b/roles/CephFile.yaml index dfa1f47eda..a03c3efc72 100644 --- a/roles/CephFile.yaml +++ b/roles/CephFile.yaml @@ -11,6 +11,7 @@ ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD + - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CephClient - OS::TripleO::Services::CephMds diff --git a/roles/CephObject.yaml b/roles/CephObject.yaml index 5930a83c37..717511219c 100644 --- a/roles/CephObject.yaml +++ b/roles/CephObject.yaml @@ -11,6 +11,7 @@ ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD + - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CephClient - OS::TripleO::Services::CephRgw diff --git a/roles/CephStorage.yaml b/roles/CephStorage.yaml index 25af585930..79fb0be99b 100644 --- a/roles/CephStorage.yaml +++ b/roles/CephStorage.yaml @@ -12,6 +12,7 @@ ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD + - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CephOSD - OS::TripleO::Services::CertmongerUser diff --git a/roles/Compute.yaml b/roles/Compute.yaml index 97b05eae2c..68a81b41e5 100644 --- a/roles/Compute.yaml +++ b/roles/Compute.yaml @@ -25,6 +25,7 @@ ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD + - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CephClient - OS::TripleO::Services::CephExternal diff --git a/roles/ComputeAlt.yaml b/roles/ComputeAlt.yaml index b28e241ee7..dda7ed37a1 100644 --- a/roles/ComputeAlt.yaml +++ b/roles/ComputeAlt.yaml @@ -15,6 +15,7 @@ TunedProfileName: "virtual-host" ServicesDefault: - OS::TripleO::Services::AuditD + - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CephClient - OS::TripleO::Services::CephExternal diff --git a/roles/ComputeDVR.yaml b/roles/ComputeDVR.yaml index fea1621f31..bbbc9b05f5 100644 --- a/roles/ComputeDVR.yaml +++ b/roles/ComputeDVR.yaml @@ -15,6 +15,7 @@ ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD + - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CephClient - OS::TripleO::Services::CephExternal diff --git a/roles/ComputeHCI.yaml b/roles/ComputeHCI.yaml index b27e784550..8e513b8b3f 100644 --- a/roles/ComputeHCI.yaml +++ b/roles/ComputeHCI.yaml @@ -14,6 +14,7 @@ ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD + - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CephClient - OS::TripleO::Services::CephExternal diff --git a/roles/ComputeInstanceHA.yaml b/roles/ComputeInstanceHA.yaml index bac5b38b47..b235d52927 100644 --- a/roles/ComputeInstanceHA.yaml +++ b/roles/ComputeInstanceHA.yaml @@ -15,6 +15,7 @@ ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD + - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CephClient - OS::TripleO::Services::CephExternal diff --git a/roles/ComputeLiquidio.yaml b/roles/ComputeLiquidio.yaml index bce50d5aa8..d79118bc3a 100644 --- a/roles/ComputeLiquidio.yaml +++ b/roles/ComputeLiquidio.yaml @@ -17,6 +17,7 @@ ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD + - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CephClient - OS::TripleO::Services::CephExternal diff --git a/roles/ComputePPC64LE.yaml b/roles/ComputePPC64LE.yaml index b562aa757d..378678b0e5 100644 --- a/roles/ComputePPC64LE.yaml +++ b/roles/ComputePPC64LE.yaml @@ -16,6 +16,7 @@ ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD + - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CephClient - OS::TripleO::Services::CephExternal diff --git a/roles/Controller.yaml b/roles/Controller.yaml index 6daa510428..d13e5e42d8 100644 --- a/roles/Controller.yaml +++ b/roles/Controller.yaml @@ -38,6 +38,7 @@ - OS::TripleO::Services::BarbicanBackendDogtag - OS::TripleO::Services::BarbicanBackendKmip - OS::TripleO::Services::BarbicanBackendPkcs11Crypto + - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CeilometerAgentCentral - OS::TripleO::Services::CeilometerAgentNotification diff --git a/roles/ControllerAllNovaStandalone.yaml b/roles/ControllerAllNovaStandalone.yaml index 46a14e1a12..6b66f9318a 100644 --- a/roles/ControllerAllNovaStandalone.yaml +++ b/roles/ControllerAllNovaStandalone.yaml @@ -25,6 +25,7 @@ - OS::TripleO::Services::AuditD - OS::TripleO::Services::BarbicanApi - OS::TripleO::Services::BarbicanBackendSimpleCrypto + - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CeilometerAgentCentral - OS::TripleO::Services::CeilometerAgentNotification diff --git a/roles/ControllerNoCeph.yaml b/roles/ControllerNoCeph.yaml index 3692c2477b..5a8028edf7 100644 --- a/roles/ControllerNoCeph.yaml +++ b/roles/ControllerNoCeph.yaml @@ -35,6 +35,7 @@ - OS::TripleO::Services::BarbicanBackendDogtag - OS::TripleO::Services::BarbicanBackendKmip - OS::TripleO::Services::BarbicanBackendPkcs11Crypto + - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CeilometerAgentCentral - OS::TripleO::Services::CeilometerAgentNotification diff --git a/roles/ControllerNovaStandalone.yaml b/roles/ControllerNovaStandalone.yaml index a1bdf7c57b..5e43152039 100644 --- a/roles/ControllerNovaStandalone.yaml +++ b/roles/ControllerNovaStandalone.yaml @@ -24,6 +24,7 @@ - OS::TripleO::Services::AuditD - OS::TripleO::Services::BarbicanApi - OS::TripleO::Services::BarbicanBackendSimpleCrypto + - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CeilometerAgentCentral - OS::TripleO::Services::CeilometerAgentNotification diff --git a/roles/ControllerOpenstack.yaml b/roles/ControllerOpenstack.yaml index e09c918e8c..1d2be05de3 100644 --- a/roles/ControllerOpenstack.yaml +++ b/roles/ControllerOpenstack.yaml @@ -29,6 +29,7 @@ - OS::TripleO::Services::BarbicanBackendDogtag - OS::TripleO::Services::BarbicanBackendKmip - OS::TripleO::Services::BarbicanBackendPkcs11Crypto + - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CeilometerAgentCentral - OS::TripleO::Services::CeilometerAgentNotification diff --git a/roles/ControllerStorageNfs.yaml b/roles/ControllerStorageNfs.yaml index 7935e4785e..1d1cd93a17 100644 --- a/roles/ControllerStorageNfs.yaml +++ b/roles/ControllerStorageNfs.yaml @@ -38,6 +38,7 @@ - OS::TripleO::Services::BarbicanBackendDogtag - OS::TripleO::Services::BarbicanBackendKmip - OS::TripleO::Services::BarbicanBackendPkcs11Crypto + - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CeilometerAgentCentral - OS::TripleO::Services::CeilometerAgentNotification diff --git a/roles/Database.yaml b/roles/Database.yaml index a22ad9a440..7b694cfc5f 100644 --- a/roles/Database.yaml +++ b/roles/Database.yaml @@ -10,6 +10,7 @@ ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD + - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::Collectd diff --git a/roles/HciCephAll.yaml b/roles/HciCephAll.yaml index ba2b3a9c0f..552d652d4a 100644 --- a/roles/HciCephAll.yaml +++ b/roles/HciCephAll.yaml @@ -15,6 +15,7 @@ ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD + - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CephClient - OS::TripleO::Services::CephExternal diff --git a/roles/HciCephFile.yaml b/roles/HciCephFile.yaml index 3b10ed4ee5..3fa6a389b1 100644 --- a/roles/HciCephFile.yaml +++ b/roles/HciCephFile.yaml @@ -15,6 +15,7 @@ ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD + - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CephClient - OS::TripleO::Services::CephExternal diff --git a/roles/HciCephMon.yaml b/roles/HciCephMon.yaml index e1eace5c23..c3290c0a66 100644 --- a/roles/HciCephMon.yaml +++ b/roles/HciCephMon.yaml @@ -15,6 +15,7 @@ ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD + - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CephClient - OS::TripleO::Services::CephExternal diff --git a/roles/HciCephObject.yaml b/roles/HciCephObject.yaml index dd8cdc02cb..ccf57013e2 100644 --- a/roles/HciCephObject.yaml +++ b/roles/HciCephObject.yaml @@ -15,6 +15,7 @@ ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD + - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CephClient - OS::TripleO::Services::CephExternal diff --git a/roles/IronicConductor.yaml b/roles/IronicConductor.yaml index aaf8170920..6ca45c9526 100644 --- a/roles/IronicConductor.yaml +++ b/roles/IronicConductor.yaml @@ -10,6 +10,7 @@ ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD + - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::Collectd diff --git a/roles/Messaging.yaml b/roles/Messaging.yaml index feab75a017..f4f0794389 100644 --- a/roles/Messaging.yaml +++ b/roles/Messaging.yaml @@ -10,6 +10,7 @@ ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD + - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::Collectd diff --git a/roles/Networker.yaml b/roles/Networker.yaml index 44305fed95..b73d6cde70 100644 --- a/roles/Networker.yaml +++ b/roles/Networker.yaml @@ -11,6 +11,7 @@ ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD + - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::Collectd diff --git a/roles/Novacontrol.yaml b/roles/Novacontrol.yaml index 4bb250d9ad..5cbf623e2e 100644 --- a/roles/Novacontrol.yaml +++ b/roles/Novacontrol.yaml @@ -10,6 +10,7 @@ HostnameFormatDefault: '%stackname%-novacontrol-%index%' ServicesDefault: - OS::TripleO::Services::AuditD + - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::Collectd diff --git a/roles/ObjectStorage.yaml b/roles/ObjectStorage.yaml index 19af28c14c..055a4d9e8b 100644 --- a/roles/ObjectStorage.yaml +++ b/roles/ObjectStorage.yaml @@ -19,6 +19,7 @@ ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD + - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::Collectd diff --git a/roles/OpenShiftAllInOne.yaml b/roles/OpenShiftAllInOne.yaml index 0dada95456..1399f0dd0c 100644 --- a/roles/OpenShiftAllInOne.yaml +++ b/roles/OpenShiftAllInOne.yaml @@ -19,6 +19,7 @@ # each, such as ['ControlPlane', 'External'] default_route_networks: ['External'] ServicesDefault: + - OS::TripleO::Services::BootParams - OS::TripleO::Services::Docker - OS::TripleO::Services::OpenShift::GlusterFS - OS::TripleO::Services::OpenShift::Infra diff --git a/roles/OpenShiftInfra.yaml b/roles/OpenShiftInfra.yaml index 7ec298d805..3ff645cd54 100644 --- a/roles/OpenShiftInfra.yaml +++ b/roles/OpenShiftInfra.yaml @@ -16,6 +16,7 @@ # each, such as ['ControlPlane', 'External'] default_route_networks: ['ControlPlane'] ServicesDefault: + - OS::TripleO::Services::BootParams - OS::TripleO::Services::Docker - OS::TripleO::Services::OpenShift::GlusterFS - OS::TripleO::Services::OpenShift::Infra diff --git a/roles/OpenShiftMaster.yaml b/roles/OpenShiftMaster.yaml index 745b6eee74..eee9b011fd 100644 --- a/roles/OpenShiftMaster.yaml +++ b/roles/OpenShiftMaster.yaml @@ -19,6 +19,7 @@ # each, such as ['ControlPlane', 'External'] default_route_networks: ['External'] ServicesDefault: + - OS::TripleO::Services::BootParams - OS::TripleO::Services::ContainerImagePrepare - OS::TripleO::Services::Docker - OS::TripleO::Services::HAproxy diff --git a/roles/OpenShiftWorker.yaml b/roles/OpenShiftWorker.yaml index b118d145be..2d5c9ddc6b 100644 --- a/roles/OpenShiftWorker.yaml +++ b/roles/OpenShiftWorker.yaml @@ -16,6 +16,7 @@ # each, such as ['ControlPlane', 'External'] default_route_networks: ['ControlPlane'] ServicesDefault: + - OS::TripleO::Services::BootParams - OS::TripleO::Services::Docker - OS::TripleO::Services::OpenShift::GlusterFS - OS::TripleO::Services::OpenShift::Worker diff --git a/roles/Telemetry.yaml b/roles/Telemetry.yaml index 30655957bc..ca7ceb3e2e 100644 --- a/roles/Telemetry.yaml +++ b/roles/Telemetry.yaml @@ -15,6 +15,7 @@ - OS::TripleO::Services::AodhListener - OS::TripleO::Services::AodhNotifier - OS::TripleO::Services::AuditD + - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CeilometerAgentCentral - OS::TripleO::Services::CeilometerAgentNotification diff --git a/roles_data.yaml b/roles_data.yaml index c219a16f4e..b4fcb7f2a6 100644 --- a/roles_data.yaml +++ b/roles_data.yaml @@ -41,6 +41,7 @@ - OS::TripleO::Services::BarbicanBackendDogtag - OS::TripleO::Services::BarbicanBackendKmip - OS::TripleO::Services::BarbicanBackendPkcs11Crypto + - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CeilometerAgentCentral - OS::TripleO::Services::CeilometerAgentNotification @@ -211,6 +212,7 @@ ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD + - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CephClient - OS::TripleO::Services::CephExternal @@ -270,6 +272,7 @@ - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD - OS::TripleO::Services::BlockStorageCinderVolume + - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::CinderBackendVRTSHyperScale @@ -316,6 +319,7 @@ ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD + - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::Collectd @@ -356,6 +360,7 @@ ServicesDefault: - OS::TripleO::Services::Aide - OS::TripleO::Services::AuditD + - OS::TripleO::Services::BootParams - OS::TripleO::Services::CACerts - OS::TripleO::Services::CephOSD - OS::TripleO::Services::CertmongerUser