From 7bebdefda849f078064f66b850114baf29a238c9 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 25 Sep 2018 15:57:17 -0400 Subject: [PATCH] Introduce OS::TripleO::Services::Podman Podman service will be in charge of installing, configuring, upgrading and updating podman in TripleO. For now, the service is disabled by default but included in all roles. In the cycle, we'll make it the default. Note: when Podman will be able to run in TripleO without Docker, we'll do like https://review.openstack.org/#/c/586679/ and make it as a generic service that can be switched to either podman or docker. But for now, we need podman & docker working side by side. Depends-On: Ie9f5d3b6380caa6824ca940ca48ed0fcf6308608 Change-Id: If9e311df2fc7b808982ee54224cc0ea27e21c830 --- .../deployed-server-roles-data.yaml | 5 ++ environments/hyperconverged-ceph.yaml | 1 + environments/podman.yaml | 2 + overcloud-resource-registry-puppet.j2.yaml | 1 + puppet/services/podman.yaml | 74 +++++++++++++++++++ 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/ComputeOvsDpdk.yaml | 1 + roles/ComputeOvsDpdkRT.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 | 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/OpenShiftInfra.yaml | 1 + roles/OpenShiftMaster.yaml | 1 + roles/OpenShiftWorker.yaml | 1 + roles/README.rst | 1 + roles/Standalone.yaml | 1 + roles/Telemetry.yaml | 1 + roles/Undercloud.yaml | 1 + roles_data.yaml | 5 ++ roles_data_undercloud.yaml | 1 + 47 files changed, 129 insertions(+) create mode 100644 environments/podman.yaml create mode 100644 puppet/services/podman.yaml diff --git a/deployed-server/deployed-server-roles-data.yaml b/deployed-server/deployed-server-roles-data.yaml index 06183a5560..1229c3efd0 100644 --- a/deployed-server/deployed-server-roles-data.yaml +++ b/deployed-server/deployed-server-roles-data.yaml @@ -141,6 +141,7 @@ - OS::TripleO::Services::OVNController - OS::TripleO::Services::Pacemaker - OS::TripleO::Services::PankoApi + - OS::TripleO::Services::Podman - OS::TripleO::Services::Redis - OS::TripleO::Services::SaharaApi - OS::TripleO::Services::SaharaEngine @@ -196,6 +197,7 @@ - OS::TripleO::Services::Ntp - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::OpenDaylightOvs + - OS::TripleO::Services::Podman - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient - OS::TripleO::Services::Snmp @@ -227,6 +229,7 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::Ntp - OS::TripleO::Services::ContainersLogrotateCrond + - OS::TripleO::Services::Podman - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient - OS::TripleO::Services::Snmp @@ -253,6 +256,7 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::Ntp - OS::TripleO::Services::ContainersLogrotateCrond + - OS::TripleO::Services::Podman - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient - OS::TripleO::Services::Snmp @@ -281,6 +285,7 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::Ntp - OS::TripleO::Services::ContainersLogrotateCrond + - OS::TripleO::Services::Podman - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient - OS::TripleO::Services::Snmp diff --git a/environments/hyperconverged-ceph.yaml b/environments/hyperconverged-ceph.yaml index 70f330dbfd..c6b33602c9 100644 --- a/environments/hyperconverged-ceph.yaml +++ b/environments/hyperconverged-ceph.yaml @@ -59,3 +59,4 @@ parameter_defaults: - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::LoginDefs - OS::TripleO::Services::Rhsm + - OS::TripleO::Services::Podman diff --git a/environments/podman.yaml b/environments/podman.yaml new file mode 100644 index 0000000000..611a2baf7c --- /dev/null +++ b/environments/podman.yaml @@ -0,0 +1,2 @@ +resource_registry: + OS::TripleO::Services::Podman: ../puppet/services/podman.yaml diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 44860315ce..87cca05ead 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -308,6 +308,7 @@ resource_registry: OS::TripleO::Services::MySQLClient: puppet/services/database/mysql-client.yaml OS::TripleO::Services::Vpp: OS::Heat::None OS::TripleO::Services::NeutronVppAgent: OS::Heat::None + OS::TripleO::Services::Podman: OS::Heat::None OS::TripleO::Services::Docker: puppet/services/docker.yaml OS::TripleO::Services::DockerRegistry: OS::Heat::None OS::TripleO::Services::ContainerImagePrepare: puppet/services/container-image-prepare.yaml diff --git a/puppet/services/podman.yaml b/puppet/services/podman.yaml new file mode 100644 index 0000000000..6e166efd1f --- /dev/null +++ b/puppet/services/podman.yaml @@ -0,0 +1,74 @@ +heat_template_version: rocky + +description: > + Configures podman on the host + +parameters: + DockerInsecureRegistryAddress: + description: Optional. The IP Address and Port of an insecure docker + namespace that will be configured in /etc/sysconfig/docker. + The value can be multiple addresses separated by commas. + type: comma_delimited_list + default: [] + EndpointMap: + default: {} + description: Mapping of service endpoint -> protocol. Typically set + via parameter_defaults in the resource registry. + type: json + ServiceData: + default: {} + description: Dictionary packing service data + type: json + ServiceNetMap: + default: {} + description: Mapping of service_name -> network name. Typically set + via parameter_defaults in the resource registry. This + mapping overrides those in ServiceNetMapDefaults. + type: json + DefaultPasswords: + default: {} + type: json + RoleName: + default: '' + description: Role name on which the service is applied + type: string + RoleParameters: + default: {} + description: Parameters specific to the role + type: json + +conditions: + insecure_registry_is_empty: {equals : [{get_param: DockerInsecureRegistryAddress}, []]} + +outputs: + role_data: + description: Role data for the podman service + value: + service_name: podman + config_settings: {} + step_config: '' + host_prep_tasks: + - name: Install and configure Podman + block: + - set_fact: + container_registry_insecure_registries: + if: + - insecure_registry_is_empty + - [] + - {get_param: DockerInsecureRegistryAddress} + - name: ensure podman and deps are installed + package: + name: podman + state: latest + - name: configure insecure registries /etc/containers/registries.conf + ini_file: + path: /etc/containers/registries.conf + section: 'registries.insecure' + option: registries + value: "{{ container_registry_insecure_registries }}" + when: container_registry_insecure_registries | length > 0 + service_config_settings: {} + upgrade_tasks: + - name: Install podman packages on upgrade if missing + when: step|int == 3 + package: name=podman state=latest diff --git a/roles/BlockStorage.yaml b/roles/BlockStorage.yaml index 825c83c357..cf4a845583 100644 --- a/roles/BlockStorage.yaml +++ b/roles/BlockStorage.yaml @@ -27,6 +27,7 @@ - OS::TripleO::Services::MetricsQdr - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::ContainersLogrotateCrond + - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty diff --git a/roles/CephAll.yaml b/roles/CephAll.yaml index 4b04066ee8..a8cb95f7c8 100644 --- a/roles/CephAll.yaml +++ b/roles/CephAll.yaml @@ -28,6 +28,7 @@ - OS::TripleO::Services::MetricsQdr - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::ContainersLogrotateCrond + - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty diff --git a/roles/CephFile.yaml b/roles/CephFile.yaml index a691614ab1..dfa1f47eda 100644 --- a/roles/CephFile.yaml +++ b/roles/CephFile.yaml @@ -25,6 +25,7 @@ - OS::TripleO::Services::MetricsQdr - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::ContainersLogrotateCrond + - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty diff --git a/roles/CephObject.yaml b/roles/CephObject.yaml index 37b3221d60..5930a83c37 100644 --- a/roles/CephObject.yaml +++ b/roles/CephObject.yaml @@ -25,6 +25,7 @@ - OS::TripleO::Services::MetricsQdr - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::ContainersLogrotateCrond + - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty diff --git a/roles/CephStorage.yaml b/roles/CephStorage.yaml index c80339ff69..25af585930 100644 --- a/roles/CephStorage.yaml +++ b/roles/CephStorage.yaml @@ -24,6 +24,7 @@ - OS::TripleO::Services::MetricsQdr - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::ContainersLogrotateCrond + - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty diff --git a/roles/Compute.yaml b/roles/Compute.yaml index 99a46543c7..97b05eae2c 100644 --- a/roles/Compute.yaml +++ b/roles/Compute.yaml @@ -52,6 +52,7 @@ - OS::TripleO::Services::NovaMigrationTarget - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::OpenDaylightOvs + - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty diff --git a/roles/ComputeAlt.yaml b/roles/ComputeAlt.yaml index efc05c23db..b28e241ee7 100644 --- a/roles/ComputeAlt.yaml +++ b/roles/ComputeAlt.yaml @@ -36,6 +36,7 @@ - OS::TripleO::Services::NovaLibvirtAlt - OS::TripleO::Services::NovaMigrationTargetAlt - OS::TripleO::Services::OpenDaylightOvs + - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClientAlt diff --git a/roles/ComputeDVR.yaml b/roles/ComputeDVR.yaml index f083adc41b..fea1621f31 100644 --- a/roles/ComputeDVR.yaml +++ b/roles/ComputeDVR.yaml @@ -42,6 +42,7 @@ - OS::TripleO::Services::NovaMigrationTarget - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::OpenDaylightOvs + - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty diff --git a/roles/ComputeHCI.yaml b/roles/ComputeHCI.yaml index 5b6f7fc000..b27e784550 100644 --- a/roles/ComputeHCI.yaml +++ b/roles/ComputeHCI.yaml @@ -42,6 +42,7 @@ - OS::TripleO::Services::NovaMigrationTarget - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::OpenDaylightOvs + - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty diff --git a/roles/ComputeInstanceHA.yaml b/roles/ComputeInstanceHA.yaml index d932bafdbe..bac5b38b47 100644 --- a/roles/ComputeInstanceHA.yaml +++ b/roles/ComputeInstanceHA.yaml @@ -44,6 +44,7 @@ - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::OpenDaylightOvs - OS::TripleO::Services::PacemakerRemote + - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty diff --git a/roles/ComputeLiquidio.yaml b/roles/ComputeLiquidio.yaml index 7d5f16b3ae..bce50d5aa8 100644 --- a/roles/ComputeLiquidio.yaml +++ b/roles/ComputeLiquidio.yaml @@ -44,6 +44,7 @@ - OS::TripleO::Services::NovaMigrationTarget - OS::TripleO::Services::LiquidioCompute - OS::TripleO::Services::ContainersLogrotateCrond + - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty diff --git a/roles/ComputeOvsDpdk.yaml b/roles/ComputeOvsDpdk.yaml index e457540d19..c5dc55f43b 100644 --- a/roles/ComputeOvsDpdk.yaml +++ b/roles/ComputeOvsDpdk.yaml @@ -43,6 +43,7 @@ - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::OpenDaylightOvs - OS::TripleO::Services::OVNMetadataAgent + - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty diff --git a/roles/ComputeOvsDpdkRT.yaml b/roles/ComputeOvsDpdkRT.yaml index 40d8d1de87..c88b7a0992 100644 --- a/roles/ComputeOvsDpdkRT.yaml +++ b/roles/ComputeOvsDpdkRT.yaml @@ -43,6 +43,7 @@ - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::OpenDaylightOvs - OS::TripleO::Services::OVNMetadataAgent + - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty diff --git a/roles/ComputePPC64LE.yaml b/roles/ComputePPC64LE.yaml index 2f73307194..b562aa757d 100644 --- a/roles/ComputePPC64LE.yaml +++ b/roles/ComputePPC64LE.yaml @@ -43,6 +43,7 @@ - OS::TripleO::Services::NovaMigrationTarget - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::OpenDaylightOvs + - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty diff --git a/roles/ComputeRealTime.yaml b/roles/ComputeRealTime.yaml index f771fe12c8..af53314198 100644 --- a/roles/ComputeRealTime.yaml +++ b/roles/ComputeRealTime.yaml @@ -50,6 +50,7 @@ - OS::TripleO::Services::NovaMigrationTarget - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::OpenDaylightOvs + - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty diff --git a/roles/ComputeSriov.yaml b/roles/ComputeSriov.yaml index 7c818f58de..f2a0f8aec7 100644 --- a/roles/ComputeSriov.yaml +++ b/roles/ComputeSriov.yaml @@ -43,6 +43,7 @@ - OS::TripleO::Services::NovaMigrationTarget - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::OpenDaylightOvs + - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty diff --git a/roles/ComputeSriovRT.yaml b/roles/ComputeSriovRT.yaml index ae80570f6d..2975a93b34 100644 --- a/roles/ComputeSriovRT.yaml +++ b/roles/ComputeSriovRT.yaml @@ -44,6 +44,7 @@ - OS::TripleO::Services::NovaMigrationTarget - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::OpenDaylightOvs + - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty diff --git a/roles/Controller.yaml b/roles/Controller.yaml index 6c159637f1..6daa510428 100644 --- a/roles/Controller.yaml +++ b/roles/Controller.yaml @@ -156,6 +156,7 @@ - OS::TripleO::Services::PankoApi - OS::TripleO::Services::OsloMessagingRpc - OS::TripleO::Services::OsloMessagingNotify + - OS::TripleO::Services::Podman - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/ControllerAllNovaStandalone.yaml b/roles/ControllerAllNovaStandalone.yaml index 2f268c5b5e..46a14e1a12 100644 --- a/roles/ControllerAllNovaStandalone.yaml +++ b/roles/ControllerAllNovaStandalone.yaml @@ -107,6 +107,7 @@ - OS::TripleO::Services::OVNController - OS::TripleO::Services::Pacemaker - OS::TripleO::Services::PankoApi + - OS::TripleO::Services::Podman - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/ControllerNoCeph.yaml b/roles/ControllerNoCeph.yaml index 73345b43f6..3692c2477b 100644 --- a/roles/ControllerNoCeph.yaml +++ b/roles/ControllerNoCeph.yaml @@ -149,6 +149,7 @@ - OS::TripleO::Services::PankoApi - OS::TripleO::Services::OsloMessagingRpc - OS::TripleO::Services::OsloMessagingNotify + - OS::TripleO::Services::Podman - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/ControllerNovaStandalone.yaml b/roles/ControllerNovaStandalone.yaml index 68388dbf2b..a1bdf7c57b 100644 --- a/roles/ControllerNovaStandalone.yaml +++ b/roles/ControllerNovaStandalone.yaml @@ -125,6 +125,7 @@ - OS::TripleO::Services::PankoApi - OS::TripleO::Services::OsloMessagingRpc - OS::TripleO::Services::OsloMessagingNotify + - OS::TripleO::Services::Podman - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/ControllerOpenstack.yaml b/roles/ControllerOpenstack.yaml index 242efff829..6ace94d63b 100644 --- a/roles/ControllerOpenstack.yaml +++ b/roles/ControllerOpenstack.yaml @@ -121,6 +121,7 @@ - OS::TripleO::Services::OVNController - OS::TripleO::Services::Pacemaker - OS::TripleO::Services::PankoApi + - OS::TripleO::Services::Podman - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/ControllerStorageNfs.yaml b/roles/ControllerStorageNfs.yaml index 927a91f092..7935e4785e 100644 --- a/roles/ControllerStorageNfs.yaml +++ b/roles/ControllerStorageNfs.yaml @@ -144,6 +144,7 @@ - OS::TripleO::Services::PankoApi - OS::TripleO::Services::OsloMessagingRpc - OS::TripleO::Services::OsloMessagingNotify + - OS::TripleO::Services::Podman - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/Database.yaml b/roles/Database.yaml index e2b6900cc7..a22ad9a440 100644 --- a/roles/Database.yaml +++ b/roles/Database.yaml @@ -24,6 +24,7 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Pacemaker + - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::SensuClient diff --git a/roles/HciCephAll.yaml b/roles/HciCephAll.yaml index 527a9507eb..ba2b3a9c0f 100644 --- a/roles/HciCephAll.yaml +++ b/roles/HciCephAll.yaml @@ -48,6 +48,7 @@ - OS::TripleO::Services::NovaMigrationTarget - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::OpenDaylightOvs + - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty diff --git a/roles/HciCephFile.yaml b/roles/HciCephFile.yaml index ee8e4545d5..3b10ed4ee5 100644 --- a/roles/HciCephFile.yaml +++ b/roles/HciCephFile.yaml @@ -44,6 +44,7 @@ - OS::TripleO::Services::NovaMigrationTarget - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::OpenDaylightOvs + - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty diff --git a/roles/HciCephMon.yaml b/roles/HciCephMon.yaml index 86a7259134..e1eace5c23 100644 --- a/roles/HciCephMon.yaml +++ b/roles/HciCephMon.yaml @@ -45,6 +45,7 @@ - OS::TripleO::Services::NovaMigrationTarget - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::OpenDaylightOvs + - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty diff --git a/roles/HciCephObject.yaml b/roles/HciCephObject.yaml index bc53be82bb..dd8cdc02cb 100644 --- a/roles/HciCephObject.yaml +++ b/roles/HciCephObject.yaml @@ -44,6 +44,7 @@ - OS::TripleO::Services::NovaMigrationTarget - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::OpenDaylightOvs + - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty diff --git a/roles/IronicConductor.yaml b/roles/IronicConductor.yaml index fd1aaab765..77bd8c10f0 100644 --- a/roles/IronicConductor.yaml +++ b/roles/IronicConductor.yaml @@ -21,6 +21,7 @@ - OS::TripleO::Services::MetricsQdr - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::ContainersLogrotateCrond + - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm - OS::TripleO::Services::SensuClient - OS::TripleO::Services::Snmp diff --git a/roles/Messaging.yaml b/roles/Messaging.yaml index c2976cc316..feab75a017 100644 --- a/roles/Messaging.yaml +++ b/roles/Messaging.yaml @@ -23,6 +23,7 @@ - OS::TripleO::Services::Pacemaker - OS::TripleO::Services::OsloMessagingRpc - OS::TripleO::Services::OsloMessagingNotify + - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm - OS::TripleO::Services::SensuClient - OS::TripleO::Services::Snmp diff --git a/roles/Networker.yaml b/roles/Networker.yaml index 896ed7121c..44305fed95 100644 --- a/roles/Networker.yaml +++ b/roles/Networker.yaml @@ -34,6 +34,7 @@ - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::OpenDaylightOvs - OS::TripleO::Services::OVNController + - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent diff --git a/roles/Novacontrol.yaml b/roles/Novacontrol.yaml index a10e840a10..4bb250d9ad 100644 --- a/roles/Novacontrol.yaml +++ b/roles/Novacontrol.yaml @@ -30,6 +30,7 @@ - OS::TripleO::Services::Ec2Api - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::OpenDaylightOvs + - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Securetty - OS::TripleO::Services::SensuClient diff --git a/roles/ObjectStorage.yaml b/roles/ObjectStorage.yaml index 2a2818cc4e..19af28c14c 100644 --- a/roles/ObjectStorage.yaml +++ b/roles/ObjectStorage.yaml @@ -30,6 +30,7 @@ - OS::TripleO::Services::MetricsQdr - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::ContainersLogrotateCrond + - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty diff --git a/roles/OpenShiftInfra.yaml b/roles/OpenShiftInfra.yaml index 215a5ce255..e4cec8a4ee 100644 --- a/roles/OpenShiftInfra.yaml +++ b/roles/OpenShiftInfra.yaml @@ -19,6 +19,7 @@ default_route_networks: ['ControlPlane'] ServicesDefault: - OS::TripleO::Services::Docker + - OS::TripleO::Services::Podman - OS::TripleO::Services::Sshd - OS::TripleO::Services::Ntp - OS::TripleO::Services::OpenShift::Worker diff --git a/roles/OpenShiftMaster.yaml b/roles/OpenShiftMaster.yaml index 6262cf0e1d..1893c11dd2 100644 --- a/roles/OpenShiftMaster.yaml +++ b/roles/OpenShiftMaster.yaml @@ -23,6 +23,7 @@ ServicesDefault: - OS::TripleO::Services::ContainerImagePrepare - OS::TripleO::Services::Docker + - OS::TripleO::Services::Podman - OS::TripleO::Services::Sshd - OS::TripleO::Services::Timesync - OS::TripleO::Services::TripleoFirewall diff --git a/roles/OpenShiftWorker.yaml b/roles/OpenShiftWorker.yaml index 4f3528aa4c..12b27a5a7b 100644 --- a/roles/OpenShiftWorker.yaml +++ b/roles/OpenShiftWorker.yaml @@ -19,6 +19,7 @@ default_route_networks: ['ControlPlane'] ServicesDefault: - OS::TripleO::Services::Docker + - OS::TripleO::Services::Podman - OS::TripleO::Services::Sshd - OS::TripleO::Services::Timesync - OS::TripleO::Services::OpenShift::Worker diff --git a/roles/README.rst b/roles/README.rst index 2c6cb40eaf..b2955f5bbe 100644 --- a/roles/README.rst +++ b/roles/README.rst @@ -172,6 +172,7 @@ Example * OS::TripleO::Services::NovaLibvirt * OS::TripleO::Services::NovaMigrationTarget * OS::TripleO::Services::OpenDaylightOvs + * OS::TripleO::Services::Podman * OS::TripleO::Services::Securetty * OS::TripleO::Services::SensuClient * OS::TripleO::Services::Snmp diff --git a/roles/Standalone.yaml b/roles/Standalone.yaml index 0334969bf4..2a14af55c9 100644 --- a/roles/Standalone.yaml +++ b/roles/Standalone.yaml @@ -149,6 +149,7 @@ - OS::TripleO::Services::OsloMessagingRpc - OS::TripleO::Services::Pacemaker - OS::TripleO::Services::PankoApi + - OS::TripleO::Services::Podman - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/Telemetry.yaml b/roles/Telemetry.yaml index 44d3842254..30655957bc 100644 --- a/roles/Telemetry.yaml +++ b/roles/Telemetry.yaml @@ -35,6 +35,7 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::Pacemaker - OS::TripleO::Services::PankoApi + - OS::TripleO::Services::Podman - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/Undercloud.yaml b/roles/Undercloud.yaml index 293912daff..9aff684a6e 100644 --- a/roles/Undercloud.yaml +++ b/roles/Undercloud.yaml @@ -75,6 +75,7 @@ - OS::TripleO::Services::OsloMessagingNotify - OS::TripleO::Services::OsloMessagingRpc - OS::TripleO::Services::PankoApi + - OS::TripleO::Services::Podman - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm - OS::TripleO::Services::SELinux diff --git a/roles_data.yaml b/roles_data.yaml index 434364d0b3..c219a16f4e 100644 --- a/roles_data.yaml +++ b/roles_data.yaml @@ -159,6 +159,7 @@ - OS::TripleO::Services::PankoApi - OS::TripleO::Services::OsloMessagingRpc - OS::TripleO::Services::OsloMessagingNotify + - OS::TripleO::Services::Podman - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar @@ -237,6 +238,7 @@ - OS::TripleO::Services::NovaMigrationTarget - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::OpenDaylightOvs + - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty @@ -281,6 +283,7 @@ - OS::TripleO::Services::MetricsQdr - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::ContainersLogrotateCrond + - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty @@ -324,6 +327,7 @@ - OS::TripleO::Services::MetricsQdr - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::ContainersLogrotateCrond + - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty @@ -364,6 +368,7 @@ - OS::TripleO::Services::MetricsQdr - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::ContainersLogrotateCrond + - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty diff --git a/roles_data_undercloud.yaml b/roles_data_undercloud.yaml index ee396bef6a..971f76b8c8 100644 --- a/roles_data_undercloud.yaml +++ b/roles_data_undercloud.yaml @@ -78,6 +78,7 @@ - OS::TripleO::Services::OsloMessagingNotify - OS::TripleO::Services::OsloMessagingRpc - OS::TripleO::Services::PankoApi + - OS::TripleO::Services::Podman - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm - OS::TripleO::Services::SELinux