From ac2711c72bcfc87635bd7bdfe44d67b96296e957 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 12 Feb 2019 16:36:56 -0500 Subject: [PATCH] Switch to Podman by default - Remove Docker service from all the roles; not needed anymore - Switch ContainerCli to podman for docker-ha environment. Note; this environment might be renamed at some point to, container-ha.yaml. But for backward compatibility we still use it now. Also switch EnablePaunch to false since we were waiting for the podman switch to do it. - In the overcloud registry, disable Docker by default and enable Podman by default. This patch will only work for centos8/rhel8 based deployments. Change-Id: I561c52ce09c66a7f79763c59cd25f15949c054af --- ci/environments/multinode-containers.yaml | 1 - ci/environments/scenario001-multinode-containers.yaml | 1 - ci/environments/scenario004-standalone.yaml | 1 - ci/environments/scenario007-multinode-containers.yaml | 1 - ci/environments/scenario010-multinode-containers.yaml | 1 - environments/docker-ha.yaml | 5 ++--- environments/hyperconverged-ceph.yaml | 1 - overcloud-resource-registry-puppet.j2.yaml | 4 ++-- roles/BlockStorage.yaml | 1 - roles/CellController.yaml | 1 - roles/CephAll.yaml | 1 - roles/CephFile.yaml | 1 - roles/CephObject.yaml | 1 - roles/CephStorage.yaml | 1 - roles/Compute.yaml | 1 - roles/ComputeDVR.yaml | 1 - roles/ComputeHCI.yaml | 1 - roles/ComputeHCIOvsDpdk.yaml | 1 - roles/ComputeHCISriov.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/ComputeSriovIB.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/ControllerStorageDashboard.yaml | 1 - roles/ControllerStorageNfs.yaml | 1 - roles/Database.yaml | 1 - roles/DistributedCompute.yaml | 1 - roles/DistributedComputeHCI.yaml | 1 - roles/DistributedComputeHCIScaleOut.yaml | 1 - roles/DistributedComputeScaleOut.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/README.rst | 1 - roles/Standalone.yaml | 1 - roles/Telemetry.yaml | 1 - roles_data.yaml | 5 ----- 57 files changed, 4 insertions(+), 64 deletions(-) diff --git a/ci/environments/multinode-containers.yaml b/ci/environments/multinode-containers.yaml index aa0f257d17..0630924b9f 100644 --- a/ci/environments/multinode-containers.yaml +++ b/ci/environments/multinode-containers.yaml @@ -10,7 +10,6 @@ parameter_defaults: ControllerServices: - OS::TripleO::Services::CACerts - OS::TripleO::Services::ContainerImagePrepare - - OS::TripleO::Services::Docker - OS::TripleO::Services::Podman - OS::TripleO::Services::Kernel - OS::TripleO::Services::Keystone diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml index f52f3be4e6..6915740432 100644 --- a/ci/environments/scenario001-multinode-containers.yaml +++ b/ci/environments/scenario001-multinode-containers.yaml @@ -37,7 +37,6 @@ parameter_defaults: - OS::TripleO::Services::CACerts - OS::TripleO::Services::Clustercheck - OS::TripleO::Services::ContainerImagePrepare - - OS::TripleO::Services::Docker - OS::TripleO::Services::Podman - OS::TripleO::Services::Kernel - OS::TripleO::Services::Keystone diff --git a/ci/environments/scenario004-standalone.yaml b/ci/environments/scenario004-standalone.yaml index c11e46a8b5..0b52112469 100644 --- a/ci/environments/scenario004-standalone.yaml +++ b/ci/environments/scenario004-standalone.yaml @@ -5,7 +5,6 @@ resource_registry: OS::TripleO::Services::CinderVolume: OS::Heat::None OS::TripleO::Services::Redis: OS::Heat::None OS::TripleO::Services::Horizon: OS::Heat::None - OS::TripleO::Services::Docker: ../../deployment/deprecated/docker/docker-baremetal-ansible.yaml OS::TripleO::Services::CephMgr: ../../deployment/ceph-ansible/ceph-mgr.yaml OS::TripleO::Services::CephMon: ../../deployment/ceph-ansible/ceph-mon.yaml OS::TripleO::Services::CephOSD: ../../deployment/ceph-ansible/ceph-osd.yaml diff --git a/ci/environments/scenario007-multinode-containers.yaml b/ci/environments/scenario007-multinode-containers.yaml index 913786196f..b4b3c16e4e 100644 --- a/ci/environments/scenario007-multinode-containers.yaml +++ b/ci/environments/scenario007-multinode-containers.yaml @@ -33,7 +33,6 @@ parameter_defaults: - OS::TripleO::Services::CACerts - OS::TripleO::Services::Clustercheck - OS::TripleO::Services::ContainerImagePrepare - - OS::TripleO::Services::Docker - OS::TripleO::Services::Podman - OS::TripleO::Services::Kernel - OS::TripleO::Services::Keystone diff --git a/ci/environments/scenario010-multinode-containers.yaml b/ci/environments/scenario010-multinode-containers.yaml index cca589b030..8f52da2a2c 100644 --- a/ci/environments/scenario010-multinode-containers.yaml +++ b/ci/environments/scenario010-multinode-containers.yaml @@ -33,7 +33,6 @@ parameter_defaults: - OS::TripleO::Services::CACerts - OS::TripleO::Services::Clustercheck - OS::TripleO::Services::ContainerImagePrepare - - OS::TripleO::Services::Docker - OS::TripleO::Services::Kernel - OS::TripleO::Services::Keystone - OS::TripleO::Services::GlanceApi diff --git a/environments/docker-ha.yaml b/environments/docker-ha.yaml index 20e37f10ae..2fcedb2465 100644 --- a/environments/docker-ha.yaml +++ b/environments/docker-ha.yaml @@ -24,7 +24,6 @@ resource_registry: OS::TripleO::Services::OVNDBs: ../deployment/ovn/ovn-dbs-pacemaker-puppet.yaml parameter_defaults: - ContainerCli: docker + ContainerCli: podman ClusterCommonTag: true - # Remove EnablePaunch once HA is tested on CentOS8 - EnablePaunch: true + EnablePaunch: false diff --git a/environments/hyperconverged-ceph.yaml b/environments/hyperconverged-ceph.yaml index ed69a0351b..9573d4f110 100644 --- a/environments/hyperconverged-ceph.yaml +++ b/environments/hyperconverged-ceph.yaml @@ -51,7 +51,6 @@ parameter_defaults: - OS::TripleO::Services::Vpp - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::MySQLClient - - OS::TripleO::Services::Docker - OS::TripleO::Services::Iscsid - OS::TripleO::Services::Multipathd - OS::TripleO::Services::OVNController diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 5a7a95a00e..833c9081ec 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -296,8 +296,8 @@ resource_registry: OS::TripleO::Services::MySQLClient: deployment/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: deployment/deprecated/docker/docker-baremetal-ansible.yaml + OS::TripleO::Services::Podman: deployment/podman/podman-baremetal-ansible.yaml + OS::TripleO::Services::Docker: OS::Heat::None OS::TripleO::Services::DockerRegistry: OS::Heat::None OS::TripleO::Services::ContainerImagePrepare: deployment/container-image-prepare/container-image-prepare-baremetal-ansible.yaml OS::TripleO::Services::CertmongerUser: deployment/certs/certmonger-user-baremetal-puppet.yaml diff --git a/roles/BlockStorage.yaml b/roles/BlockStorage.yaml index 94d8622cc2..6ea9ec3107 100644 --- a/roles/BlockStorage.yaml +++ b/roles/BlockStorage.yaml @@ -23,7 +23,6 @@ - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::CinderBackendVRTSHyperScale - OS::TripleO::Services::Collectd - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Iscsid diff --git a/roles/CellController.yaml b/roles/CellController.yaml index 517ea69053..1bb55b9a51 100644 --- a/roles/CellController.yaml +++ b/roles/CellController.yaml @@ -32,7 +32,6 @@ - OS::TripleO::Services::Clustercheck - OS::TripleO::Services::Collectd - OS::TripleO::Services::ContainerImagePrepare - - OS::TripleO::Services::Docker - OS::TripleO::Services::HAproxy - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Iscsid diff --git a/roles/CephAll.yaml b/roles/CephAll.yaml index 2d73e47e80..bf7b0bf923 100644 --- a/roles/CephAll.yaml +++ b/roles/CephAll.yaml @@ -26,7 +26,6 @@ - OS::TripleO::Services::CephOSD - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::Collectd - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Kernel diff --git a/roles/CephFile.yaml b/roles/CephFile.yaml index ef8db8b820..11df0509d4 100644 --- a/roles/CephFile.yaml +++ b/roles/CephFile.yaml @@ -22,7 +22,6 @@ - OS::TripleO::Services::CephOSD - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::Collectd - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Kernel diff --git a/roles/CephObject.yaml b/roles/CephObject.yaml index 332fdde9c7..bdf2119e17 100644 --- a/roles/CephObject.yaml +++ b/roles/CephObject.yaml @@ -22,7 +22,6 @@ - OS::TripleO::Services::CephOSD - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::Collectd - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Kernel diff --git a/roles/CephStorage.yaml b/roles/CephStorage.yaml index b4411229f1..22abc4e7f8 100644 --- a/roles/CephStorage.yaml +++ b/roles/CephStorage.yaml @@ -21,7 +21,6 @@ - OS::TripleO::Services::CephOSD - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::Collectd - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Kernel diff --git a/roles/Compute.yaml b/roles/Compute.yaml index 68e2b160ff..a0758ffd3f 100644 --- a/roles/Compute.yaml +++ b/roles/Compute.yaml @@ -45,7 +45,6 @@ - OS::TripleO::Services::ComputeNeutronL3Agent - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsAgent - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Iscsid diff --git a/roles/ComputeDVR.yaml b/roles/ComputeDVR.yaml index c5b7f5c9b4..8026caac26 100644 --- a/roles/ComputeDVR.yaml +++ b/roles/ComputeDVR.yaml @@ -32,7 +32,6 @@ - OS::TripleO::Services::ComputeNeutronL3Agent - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsAgent - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Iscsid diff --git a/roles/ComputeHCI.yaml b/roles/ComputeHCI.yaml index c3fbacacc4..5051ca6add 100644 --- a/roles/ComputeHCI.yaml +++ b/roles/ComputeHCI.yaml @@ -32,7 +32,6 @@ - OS::TripleO::Services::ComputeNeutronL3Agent - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsAgent - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Iscsid diff --git a/roles/ComputeHCIOvsDpdk.yaml b/roles/ComputeHCIOvsDpdk.yaml index 37277c3d95..58edb3162b 100644 --- a/roles/ComputeHCIOvsDpdk.yaml +++ b/roles/ComputeHCIOvsDpdk.yaml @@ -35,7 +35,6 @@ - OS::TripleO::Services::ComputeNeutronL3Agent - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsDpdk - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Iscsid diff --git a/roles/ComputeHCISriov.yaml b/roles/ComputeHCISriov.yaml index a330316180..a256911adf 100644 --- a/roles/ComputeHCISriov.yaml +++ b/roles/ComputeHCISriov.yaml @@ -32,7 +32,6 @@ - OS::TripleO::Services::ComputeNeutronL3Agent - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsAgent - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Iscsid diff --git a/roles/ComputeInstanceHA.yaml b/roles/ComputeInstanceHA.yaml index d13540691c..8dceb8ce7d 100644 --- a/roles/ComputeInstanceHA.yaml +++ b/roles/ComputeInstanceHA.yaml @@ -31,7 +31,6 @@ - OS::TripleO::Services::ComputeNeutronL3Agent - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsAgent - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Iscsid diff --git a/roles/ComputeLiquidio.yaml b/roles/ComputeLiquidio.yaml index a995551be1..356a21b511 100644 --- a/roles/ComputeLiquidio.yaml +++ b/roles/ComputeLiquidio.yaml @@ -32,7 +32,6 @@ - OS::TripleO::Services::ComputeNeutronL3Agent - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsAgent - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Iscsid diff --git a/roles/ComputeLocalEphemeral.yaml b/roles/ComputeLocalEphemeral.yaml index b37c393bf3..75d9b4e1d0 100644 --- a/roles/ComputeLocalEphemeral.yaml +++ b/roles/ComputeLocalEphemeral.yaml @@ -34,7 +34,6 @@ - OS::TripleO::Services::ComputeNeutronL3Agent - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsAgent - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Iscsid diff --git a/roles/ComputeOvsDpdk.yaml b/roles/ComputeOvsDpdk.yaml index ae824874e7..9ac3203019 100644 --- a/roles/ComputeOvsDpdk.yaml +++ b/roles/ComputeOvsDpdk.yaml @@ -33,7 +33,6 @@ - OS::TripleO::Services::ComputeNeutronL3Agent - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsDpdk - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Iscsid diff --git a/roles/ComputeOvsDpdkRT.yaml b/roles/ComputeOvsDpdkRT.yaml index b97258c62e..0112e5b0ff 100644 --- a/roles/ComputeOvsDpdkRT.yaml +++ b/roles/ComputeOvsDpdkRT.yaml @@ -34,7 +34,6 @@ - OS::TripleO::Services::ComputeNeutronL3Agent - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsDpdk - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Iscsid diff --git a/roles/ComputeOvsDpdkSriov.yaml b/roles/ComputeOvsDpdkSriov.yaml index d1971fc1ba..d15cdccd95 100644 --- a/roles/ComputeOvsDpdkSriov.yaml +++ b/roles/ComputeOvsDpdkSriov.yaml @@ -29,7 +29,6 @@ - OS::TripleO::Services::ComputeNeutronL3Agent - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsDpdk - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Iscsid diff --git a/roles/ComputeOvsDpdkSriovRT.yaml b/roles/ComputeOvsDpdkSriovRT.yaml index bcdeaa2bdd..435f060689 100644 --- a/roles/ComputeOvsDpdkSriovRT.yaml +++ b/roles/ComputeOvsDpdkSriovRT.yaml @@ -31,7 +31,6 @@ - OS::TripleO::Services::ComputeNeutronL3Agent - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsDpdk - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Iscsid diff --git a/roles/ComputePPC64LE.yaml b/roles/ComputePPC64LE.yaml index 854da76d78..3d20c68f1f 100644 --- a/roles/ComputePPC64LE.yaml +++ b/roles/ComputePPC64LE.yaml @@ -31,7 +31,6 @@ - OS::TripleO::Services::ComputeNeutronL3Agent - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsAgent - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Iscsid diff --git a/roles/ComputeRBDEphemeral.yaml b/roles/ComputeRBDEphemeral.yaml index d36f3e903d..b835680378 100644 --- a/roles/ComputeRBDEphemeral.yaml +++ b/roles/ComputeRBDEphemeral.yaml @@ -34,7 +34,6 @@ - OS::TripleO::Services::ComputeNeutronL3Agent - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsAgent - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Iscsid diff --git a/roles/ComputeRealTime.yaml b/roles/ComputeRealTime.yaml index 0fc97259d5..a86fb39f11 100644 --- a/roles/ComputeRealTime.yaml +++ b/roles/ComputeRealTime.yaml @@ -40,7 +40,6 @@ - OS::TripleO::Services::ComputeNeutronL3Agent - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsAgent - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Iscsid diff --git a/roles/ComputeSriov.yaml b/roles/ComputeSriov.yaml index 232d83e828..96ee949cd4 100644 --- a/roles/ComputeSriov.yaml +++ b/roles/ComputeSriov.yaml @@ -29,7 +29,6 @@ - OS::TripleO::Services::ComputeNeutronL3Agent - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsAgent - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Iscsid diff --git a/roles/ComputeSriovIB.yaml b/roles/ComputeSriovIB.yaml index a2804766d3..3b6630d737 100644 --- a/roles/ComputeSriovIB.yaml +++ b/roles/ComputeSriovIB.yaml @@ -29,7 +29,6 @@ - OS::TripleO::Services::ComputeNeutronL3Agent - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsAgent - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Iscsid diff --git a/roles/ComputeSriovRT.yaml b/roles/ComputeSriovRT.yaml index 4c57aafdf0..42d9d216ab 100644 --- a/roles/ComputeSriovRT.yaml +++ b/roles/ComputeSriovRT.yaml @@ -31,7 +31,6 @@ - OS::TripleO::Services::ComputeNeutronL3Agent - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsAgent - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Iscsid diff --git a/roles/Controller.yaml b/roles/Controller.yaml index f454227b6b..a2f0cee26b 100644 --- a/roles/Controller.yaml +++ b/roles/Controller.yaml @@ -81,7 +81,6 @@ - OS::TripleO::Services::DesignateWorker - OS::TripleO::Services::DesignateMDNS - OS::TripleO::Services::DesignateSink - - OS::TripleO::Services::Docker - OS::TripleO::Services::Etcd - OS::TripleO::Services::ExternalSwiftProxy - OS::TripleO::Services::GlanceApi diff --git a/roles/ControllerAllNovaStandalone.yaml b/roles/ControllerAllNovaStandalone.yaml index 736663a230..f58104b48a 100644 --- a/roles/ControllerAllNovaStandalone.yaml +++ b/roles/ControllerAllNovaStandalone.yaml @@ -55,7 +55,6 @@ - OS::TripleO::Services::DesignateWorker - OS::TripleO::Services::DesignateMDNS - OS::TripleO::Services::DesignateSink - - OS::TripleO::Services::Docker - OS::TripleO::Services::Etcd - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec diff --git a/roles/ControllerNoCeph.yaml b/roles/ControllerNoCeph.yaml index 2cb52fdeac..0087a57bb1 100644 --- a/roles/ControllerNoCeph.yaml +++ b/roles/ControllerNoCeph.yaml @@ -73,7 +73,6 @@ - OS::TripleO::Services::DesignateWorker - OS::TripleO::Services::DesignateMDNS - OS::TripleO::Services::DesignateSink - - OS::TripleO::Services::Docker - OS::TripleO::Services::Etcd - OS::TripleO::Services::ExternalSwiftProxy - OS::TripleO::Services::GlanceApi diff --git a/roles/ControllerNovaStandalone.yaml b/roles/ControllerNovaStandalone.yaml index ed31ddfb30..1b043be27d 100644 --- a/roles/ControllerNovaStandalone.yaml +++ b/roles/ControllerNovaStandalone.yaml @@ -58,7 +58,6 @@ - OS::TripleO::Services::CinderVolume - OS::TripleO::Services::Clustercheck - OS::TripleO::Services::Collectd - - OS::TripleO::Services::Docker - OS::TripleO::Services::Etcd - OS::TripleO::Services::ExternalSwiftProxy - OS::TripleO::Services::GlanceApi diff --git a/roles/ControllerOpenstack.yaml b/roles/ControllerOpenstack.yaml index 41f9915c63..977d66af39 100644 --- a/roles/ControllerOpenstack.yaml +++ b/roles/ControllerOpenstack.yaml @@ -60,7 +60,6 @@ - OS::TripleO::Services::DesignateWorker - OS::TripleO::Services::DesignateMDNS - OS::TripleO::Services::DesignateSink - - OS::TripleO::Services::Docker - OS::TripleO::Services::Etcd - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec diff --git a/roles/ControllerStorageDashboard.yaml b/roles/ControllerStorageDashboard.yaml index e1cc964357..d3d18b7026 100644 --- a/roles/ControllerStorageDashboard.yaml +++ b/roles/ControllerStorageDashboard.yaml @@ -82,7 +82,6 @@ - OS::TripleO::Services::DesignateWorker - OS::TripleO::Services::DesignateMDNS - OS::TripleO::Services::DesignateSink - - OS::TripleO::Services::Docker - OS::TripleO::Services::Etcd - OS::TripleO::Services::ExternalSwiftProxy - OS::TripleO::Services::GlanceApi diff --git a/roles/ControllerStorageNfs.yaml b/roles/ControllerStorageNfs.yaml index 179fffb009..eb80055a90 100644 --- a/roles/ControllerStorageNfs.yaml +++ b/roles/ControllerStorageNfs.yaml @@ -83,7 +83,6 @@ - OS::TripleO::Services::DesignateWorker - OS::TripleO::Services::DesignateMDNS - OS::TripleO::Services::DesignateSink - - OS::TripleO::Services::Docker - OS::TripleO::Services::Etcd - OS::TripleO::Services::ExternalSwiftProxy - OS::TripleO::Services::GlanceApi diff --git a/roles/Database.yaml b/roles/Database.yaml index 0e2a7cb6b6..e96e488fbc 100644 --- a/roles/Database.yaml +++ b/roles/Database.yaml @@ -17,7 +17,6 @@ - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::Collectd - OS::TripleO::Services::Clustercheck - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Kernel diff --git a/roles/DistributedCompute.yaml b/roles/DistributedCompute.yaml index e6731add46..08f4338e3a 100644 --- a/roles/DistributedCompute.yaml +++ b/roles/DistributedCompute.yaml @@ -29,7 +29,6 @@ - OS::TripleO::Services::ComputeNeutronL3Agent - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsAgent - - OS::TripleO::Services::Docker - OS::TripleO::Services::Etcd - OS::TripleO::Services::GlanceApiEdge - OS::TripleO::Services::IpaClient diff --git a/roles/DistributedComputeHCI.yaml b/roles/DistributedComputeHCI.yaml index b861563583..6cb04bb6df 100644 --- a/roles/DistributedComputeHCI.yaml +++ b/roles/DistributedComputeHCI.yaml @@ -38,7 +38,6 @@ - OS::TripleO::Services::ComputeNeutronL3Agent - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsAgent - - OS::TripleO::Services::Docker - OS::TripleO::Services::Etcd - OS::TripleO::Services::GlanceApiEdge - OS::TripleO::Services::IpaClient diff --git a/roles/DistributedComputeHCIScaleOut.yaml b/roles/DistributedComputeHCIScaleOut.yaml index d9c7b7983d..cc521072aa 100644 --- a/roles/DistributedComputeHCIScaleOut.yaml +++ b/roles/DistributedComputeHCIScaleOut.yaml @@ -32,7 +32,6 @@ - OS::TripleO::Services::ComputeNeutronL3Agent - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsAgent - - OS::TripleO::Services::Docker - OS::TripleO::Services::Etcd - OS::TripleO::Services::HAproxyEdge - OS::TripleO::Services::IpaClient diff --git a/roles/DistributedComputeScaleOut.yaml b/roles/DistributedComputeScaleOut.yaml index fb2901935c..bfa08da80d 100644 --- a/roles/DistributedComputeScaleOut.yaml +++ b/roles/DistributedComputeScaleOut.yaml @@ -29,7 +29,6 @@ - OS::TripleO::Services::ComputeNeutronL3Agent - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsAgent - - OS::TripleO::Services::Docker - OS::TripleO::Services::Etcd - OS::TripleO::Services::HAproxyEdge - OS::TripleO::Services::IpaClient diff --git a/roles/HciCephAll.yaml b/roles/HciCephAll.yaml index cfc40c703d..0e389a8eba 100644 --- a/roles/HciCephAll.yaml +++ b/roles/HciCephAll.yaml @@ -39,7 +39,6 @@ - OS::TripleO::Services::ComputeNeutronL3Agent - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsAgent - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Iscsid diff --git a/roles/HciCephFile.yaml b/roles/HciCephFile.yaml index 4e6460b8e0..8bddab4c8b 100644 --- a/roles/HciCephFile.yaml +++ b/roles/HciCephFile.yaml @@ -34,7 +34,6 @@ - OS::TripleO::Services::ComputeNeutronL3Agent - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsAgent - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Iscsid diff --git a/roles/HciCephMon.yaml b/roles/HciCephMon.yaml index f0a06b1761..a0f16f60bc 100644 --- a/roles/HciCephMon.yaml +++ b/roles/HciCephMon.yaml @@ -35,7 +35,6 @@ - OS::TripleO::Services::ComputeNeutronL3Agent - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsAgent - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Iscsid diff --git a/roles/HciCephObject.yaml b/roles/HciCephObject.yaml index 5f394ca8aa..e20b47c8ab 100644 --- a/roles/HciCephObject.yaml +++ b/roles/HciCephObject.yaml @@ -34,7 +34,6 @@ - OS::TripleO::Services::ComputeNeutronL3Agent - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsAgent - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Iscsid diff --git a/roles/IronicConductor.yaml b/roles/IronicConductor.yaml index 04d4308159..0d79a1b0bc 100644 --- a/roles/IronicConductor.yaml +++ b/roles/IronicConductor.yaml @@ -18,7 +18,6 @@ - OS::TripleO::Services::CACerts - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::Collectd - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::IronicConductor diff --git a/roles/Messaging.yaml b/roles/Messaging.yaml index 23aaa761f6..2da1381dae 100644 --- a/roles/Messaging.yaml +++ b/roles/Messaging.yaml @@ -16,7 +16,6 @@ - OS::TripleO::Services::CACerts - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::Collectd - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Kernel diff --git a/roles/Networker.yaml b/roles/Networker.yaml index 73ebfa34a9..b5a5be2e8a 100644 --- a/roles/Networker.yaml +++ b/roles/Networker.yaml @@ -20,7 +20,6 @@ - OS::TripleO::Services::CACerts - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::Collectd - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::IronicNeutronAgent diff --git a/roles/Novacontrol.yaml b/roles/Novacontrol.yaml index ef2f640d8f..ec6c7c0f7d 100644 --- a/roles/Novacontrol.yaml +++ b/roles/Novacontrol.yaml @@ -17,7 +17,6 @@ - OS::TripleO::Services::CACerts - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::Collectd - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Kernel diff --git a/roles/ObjectStorage.yaml b/roles/ObjectStorage.yaml index 936e946cf6..ff1fe204ea 100644 --- a/roles/ObjectStorage.yaml +++ b/roles/ObjectStorage.yaml @@ -29,7 +29,6 @@ - OS::TripleO::Services::CACerts - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::Collectd - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Kernel diff --git a/roles/README.rst b/roles/README.rst index e47fb34899..dc2e2280a1 100644 --- a/roles/README.rst +++ b/roles/README.rst @@ -161,7 +161,6 @@ Example * OS::TripleO::Services::ComputeNeutronL3Agent * OS::TripleO::Services::ComputeNeutronMetadataAgent * OS::TripleO::Services::ComputeNeutronOvsAgent - * OS::TripleO::Services::Docker * OS::TripleO::Services::Iscsid * OS::TripleO::Services::Kernel * OS::TripleO::Services::MySQLClient diff --git a/roles/Standalone.yaml b/roles/Standalone.yaml index 5ee68ad0ef..e42bbb0898 100644 --- a/roles/Standalone.yaml +++ b/roles/Standalone.yaml @@ -75,7 +75,6 @@ - OS::TripleO::Services::DesignateProducer - OS::TripleO::Services::DesignateSink - OS::TripleO::Services::DesignateWorker - - OS::TripleO::Services::Docker - OS::TripleO::Services::DockerRegistry - OS::TripleO::Services::Etcd - OS::TripleO::Services::ExternalSwiftProxy diff --git a/roles/Telemetry.yaml b/roles/Telemetry.yaml index b34990e18d..e4b4733380 100644 --- a/roles/Telemetry.yaml +++ b/roles/Telemetry.yaml @@ -27,7 +27,6 @@ - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::Collectd - OS::TripleO::Services::ContainersLogrotateCrond - - OS::TripleO::Services::Docker - OS::TripleO::Services::GnocchiApi - OS::TripleO::Services::GnocchiMetricd - OS::TripleO::Services::GnocchiStatsd diff --git a/roles_data.yaml b/roles_data.yaml index ba2520a764..198aa57d2c 100644 --- a/roles_data.yaml +++ b/roles_data.yaml @@ -84,7 +84,6 @@ - OS::TripleO::Services::DesignateWorker - OS::TripleO::Services::DesignateMDNS - OS::TripleO::Services::DesignateSink - - OS::TripleO::Services::Docker - OS::TripleO::Services::Etcd - OS::TripleO::Services::ExternalSwiftProxy - OS::TripleO::Services::GlanceApi @@ -230,7 +229,6 @@ - OS::TripleO::Services::ComputeNeutronL3Agent - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::ComputeNeutronOvsAgent - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Iscsid @@ -289,7 +287,6 @@ - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::CinderBackendVRTSHyperScale - OS::TripleO::Services::Collectd - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Iscsid @@ -343,7 +340,6 @@ - OS::TripleO::Services::CACerts - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::Collectd - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Kernel @@ -390,7 +386,6 @@ - OS::TripleO::Services::CephOSD - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::Collectd - - OS::TripleO::Services::Docker - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec - OS::TripleO::Services::Kernel