From 93d87cf18de95b25942b937bd74c7bcfe8345abb Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Thu, 12 Jul 2018 12:26:14 +1200 Subject: [PATCH] Always enable image prepare service for docker clouds This change includes the service OS::TripleO::Services::ContainerImagePrepare by default in the overcloud which will trigger a container image prepare in the same way as is currently done for the containerized undercloud. Along with the mistral action which populates the container image parameters, this change makes blueprint container-prepare-workflow functionally complete. Change-Id: I8b0c5e630e63ef6a2e6f70f1eb00fd02f4cfd1c0 Blueprint: container-prepare-workflow --- ci/environments/multinode-3nodes.yaml | 1 + ci/environments/multinode-containers.yaml | 1 + ci/environments/multinode.yaml | 1 + ci/environments/multinode_major_upgrade.yaml | 1 + ci/environments/ovb-ha.yaml | 1 + ci/environments/scenario000-multinode-containers.yaml | 1 + ci/environments/scenario001-multinode-containers.yaml | 1 + ci/environments/scenario002-multinode-containers.yaml | 1 + ci/environments/scenario003-multinode-containers.yaml | 1 + ci/environments/scenario004-multinode-containers.yaml | 1 + ci/environments/scenario006-multinode-containers.yaml | 1 + ci/environments/scenario006-multinode.yaml | 1 + ci/environments/scenario007-multinode-containers.yaml | 1 + ci/environments/scenario008-multinode-containers.yaml | 1 + ci/environments/scenario009-multinode.yaml | 1 + ci/environments/scenario010-multinode-containers.yaml | 1 + ci/environments/scenario011-multinode-containers.yaml | 1 + deployed-server/deployed-server-roles-data.yaml | 1 + overcloud-resource-registry-puppet.j2.yaml | 2 +- roles/Controller.yaml | 1 + roles/ControllerNoCeph.yaml | 1 + roles_data.yaml | 1 + 22 files changed, 22 insertions(+), 1 deletion(-) diff --git a/ci/environments/multinode-3nodes.yaml b/ci/environments/multinode-3nodes.yaml index 67f51c4646..528004211b 100644 --- a/ci/environments/multinode-3nodes.yaml +++ b/ci/environments/multinode-3nodes.yaml @@ -65,6 +65,7 @@ - OS::TripleO::Services::CinderBackup - OS::TripleO::Services::CinderVolume - OS::TripleO::Services::Clustercheck + - OS::TripleO::Services::ContainerImagePrepare - OS::TripleO::Services::Docker - OS::TripleO::Services::Kernel - OS::TripleO::Services::MySQL diff --git a/ci/environments/multinode-containers.yaml b/ci/environments/multinode-containers.yaml index 2374642e85..162800e454 100644 --- a/ci/environments/multinode-containers.yaml +++ b/ci/environments/multinode-containers.yaml @@ -20,6 +20,7 @@ parameter_defaults: ControllerServices: - OS::TripleO::Services::CACerts - OS::TripleO::Services::Clustercheck + - OS::TripleO::Services::ContainerImagePrepare - OS::TripleO::Services::Docker - OS::TripleO::Services::Kernel - OS::TripleO::Services::Keystone diff --git a/ci/environments/multinode.yaml b/ci/environments/multinode.yaml index a817e2f257..b338142509 100644 --- a/ci/environments/multinode.yaml +++ b/ci/environments/multinode.yaml @@ -23,6 +23,7 @@ parameter_defaults: - OS::TripleO::Services::CinderScheduler - OS::TripleO::Services::CinderVolume - OS::TripleO::Services::Clustercheck + - OS::TripleO::Services::ContainerImagePrepare - OS::TripleO::Services::Docker - OS::TripleO::Services::Kernel - OS::TripleO::Services::Keystone diff --git a/ci/environments/multinode_major_upgrade.yaml b/ci/environments/multinode_major_upgrade.yaml index 608489fff8..56c965e8c9 100644 --- a/ci/environments/multinode_major_upgrade.yaml +++ b/ci/environments/multinode_major_upgrade.yaml @@ -15,6 +15,7 @@ parameter_defaults: ControllerServices: - OS::TripleO::Services::CACerts - OS::TripleO::Services::Clustercheck + - OS::TripleO::Services::ContainerImagePrepare - OS::TripleO::Services::Docker - OS::TripleO::Services::Kernel - OS::TripleO::Services::Keystone diff --git a/ci/environments/ovb-ha.yaml b/ci/environments/ovb-ha.yaml index 979dbc97fe..e7465541e7 100644 --- a/ci/environments/ovb-ha.yaml +++ b/ci/environments/ovb-ha.yaml @@ -2,6 +2,7 @@ parameter_defaults: ControllerServices: - OS::TripleO::Services::CACerts - OS::TripleO::Services::Clustercheck + - OS::TripleO::Services::ContainerImagePrepare - OS::TripleO::Services::Docker - OS::TripleO::Services::GlanceApi - OS::TripleO::Services::HAproxy diff --git a/ci/environments/scenario000-multinode-containers.yaml b/ci/environments/scenario000-multinode-containers.yaml index 6d85ef6ad6..0d84df2a50 100644 --- a/ci/environments/scenario000-multinode-containers.yaml +++ b/ci/environments/scenario000-multinode-containers.yaml @@ -21,6 +21,7 @@ parameter_defaults: ControllerServices: - OS::TripleO::Services::CACerts - OS::TripleO::Services::Clustercheck + - OS::TripleO::Services::ContainerImagePrepare - OS::TripleO::Services::Docker - 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 d7579d3b0a..73751dfdcd 100644 --- a/ci/environments/scenario001-multinode-containers.yaml +++ b/ci/environments/scenario001-multinode-containers.yaml @@ -36,6 +36,7 @@ parameter_defaults: ControllerServices: - OS::TripleO::Services::CACerts - OS::TripleO::Services::Clustercheck + - OS::TripleO::Services::ContainerImagePrepare - OS::TripleO::Services::Docker - OS::TripleO::Services::Kernel - OS::TripleO::Services::Keystone diff --git a/ci/environments/scenario002-multinode-containers.yaml b/ci/environments/scenario002-multinode-containers.yaml index 0e98f1d20d..bb37a2ebb7 100644 --- a/ci/environments/scenario002-multinode-containers.yaml +++ b/ci/environments/scenario002-multinode-containers.yaml @@ -28,6 +28,7 @@ parameter_defaults: ControllerServices: - OS::TripleO::Services::CACerts - OS::TripleO::Services::Clustercheck + - OS::TripleO::Services::ContainerImagePrepare - OS::TripleO::Services::Docker - OS::TripleO::Services::Kernel - OS::TripleO::Services::Keystone diff --git a/ci/environments/scenario003-multinode-containers.yaml b/ci/environments/scenario003-multinode-containers.yaml index 5a97c75fa9..1a9867bf03 100644 --- a/ci/environments/scenario003-multinode-containers.yaml +++ b/ci/environments/scenario003-multinode-containers.yaml @@ -31,6 +31,7 @@ parameter_defaults: ControllerServices: - OS::TripleO::Services::CACerts - OS::TripleO::Services::Clustercheck + - OS::TripleO::Services::ContainerImagePrepare - OS::TripleO::Services::Docker - OS::TripleO::Services::Kernel - OS::TripleO::Services::Keystone diff --git a/ci/environments/scenario004-multinode-containers.yaml b/ci/environments/scenario004-multinode-containers.yaml index 028654935a..a1db9b6807 100644 --- a/ci/environments/scenario004-multinode-containers.yaml +++ b/ci/environments/scenario004-multinode-containers.yaml @@ -47,6 +47,7 @@ parameter_defaults: - OS::TripleO::Services::CephOSD - OS::TripleO::Services::CephRgw - OS::TripleO::Services::Clustercheck + - OS::TripleO::Services::ContainerImagePrepare - OS::TripleO::Services::Docker - OS::TripleO::Services::Kernel - OS::TripleO::Services::Keystone diff --git a/ci/environments/scenario006-multinode-containers.yaml b/ci/environments/scenario006-multinode-containers.yaml index 090878c443..ffb5af3557 100644 --- a/ci/environments/scenario006-multinode-containers.yaml +++ b/ci/environments/scenario006-multinode-containers.yaml @@ -9,6 +9,7 @@ resource_registry: parameter_defaults: ControllerServices: - OS::TripleO::Services::Clustercheck + - OS::TripleO::Services::ContainerImagePrepare - OS::TripleO::Services::Docker - OS::TripleO::Services::Kernel - OS::TripleO::Services::Keystone diff --git a/ci/environments/scenario006-multinode.yaml b/ci/environments/scenario006-multinode.yaml index 0cbf9a4d45..3f1afea0f5 100644 --- a/ci/environments/scenario006-multinode.yaml +++ b/ci/environments/scenario006-multinode.yaml @@ -37,6 +37,7 @@ parameter_defaults: ControllerServices: - OS::TripleO::Services::CACerts + - OS::TripleO::Services::ContainerImagePrepare - OS::TripleO::Services::Docker - OS::TripleO::Services::Kernel - OS::TripleO::Services::Ntp diff --git a/ci/environments/scenario007-multinode-containers.yaml b/ci/environments/scenario007-multinode-containers.yaml index 085b3cc3f4..111e70bb50 100644 --- a/ci/environments/scenario007-multinode-containers.yaml +++ b/ci/environments/scenario007-multinode-containers.yaml @@ -20,6 +20,7 @@ parameter_defaults: ControllerServices: - OS::TripleO::Services::CACerts - OS::TripleO::Services::Clustercheck + - OS::TripleO::Services::ContainerImagePrepare - OS::TripleO::Services::Docker - OS::TripleO::Services::Kernel - OS::TripleO::Services::Keystone diff --git a/ci/environments/scenario008-multinode-containers.yaml b/ci/environments/scenario008-multinode-containers.yaml index cd09d33498..2a1d2749b5 100644 --- a/ci/environments/scenario008-multinode-containers.yaml +++ b/ci/environments/scenario008-multinode-containers.yaml @@ -10,6 +10,7 @@ resource_registry: parameter_defaults: ControllerServices: + - OS::TripleO::Services::ContainerImagePrepare - OS::TripleO::Services::Docker - OS::TripleO::Services::GlanceApi - OS::TripleO::Services::HAproxy diff --git a/ci/environments/scenario009-multinode.yaml b/ci/environments/scenario009-multinode.yaml index c832f55576..26d1af9929 100644 --- a/ci/environments/scenario009-multinode.yaml +++ b/ci/environments/scenario009-multinode.yaml @@ -10,6 +10,7 @@ parameter_defaults: ControllerServices: - OS::TripleO::Services::DisableUnbound - OS::TripleO::Services::CACerts + - OS::TripleO::Services::ContainerImagePrepare - OS::TripleO::Services::Docker - OS::TripleO::Services::Kernel - OS::TripleO::Services::Ntp diff --git a/ci/environments/scenario010-multinode-containers.yaml b/ci/environments/scenario010-multinode-containers.yaml index b12f2d0543..cfb841fc63 100644 --- a/ci/environments/scenario010-multinode-containers.yaml +++ b/ci/environments/scenario010-multinode-containers.yaml @@ -21,6 +21,7 @@ parameter_defaults: ControllerServices: - OS::TripleO::Services::CACerts - OS::TripleO::Services::Clustercheck + - OS::TripleO::Services::ContainerImagePrepare - OS::TripleO::Services::Docker - OS::TripleO::Services::Kernel - OS::TripleO::Services::Keystone diff --git a/ci/environments/scenario011-multinode-containers.yaml b/ci/environments/scenario011-multinode-containers.yaml index ffd5abab01..2326fcf4a4 100644 --- a/ci/environments/scenario011-multinode-containers.yaml +++ b/ci/environments/scenario011-multinode-containers.yaml @@ -25,6 +25,7 @@ resource_registry: parameter_defaults: ControllerServices: - OS::TripleO::Services::Clustercheck + - OS::TripleO::Services::ContainerImagePrepare - OS::TripleO::Services::Docker - OS::TripleO::Services::Keystone - OS::TripleO::Services::GlanceApi diff --git a/deployed-server/deployed-server-roles-data.yaml b/deployed-server/deployed-server-roles-data.yaml index 062ba09d3a..06183a5560 100644 --- a/deployed-server/deployed-server-roles-data.yaml +++ b/deployed-server/deployed-server-roles-data.yaml @@ -66,6 +66,7 @@ - OS::TripleO::Services::CinderScheduler - OS::TripleO::Services::CinderVolume - OS::TripleO::Services::Clustercheck + - OS::TripleO::Services::ContainerImagePrepare - OS::TripleO::Services::Collectd - OS::TripleO::Services::Congress - OS::TripleO::Services::Docker diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 89363f06dc..3a2a0c2f1a 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -305,7 +305,7 @@ resource_registry: OS::TripleO::Services::NeutronVppAgent: OS::Heat::None OS::TripleO::Services::Docker: puppet/services/docker.yaml OS::TripleO::Services::DockerRegistry: OS::Heat::None - OS::TripleO::Services::ContainerImagePrepare: OS::Heat::None + OS::TripleO::Services::ContainerImagePrepare: puppet/services/container-image-prepare.yaml OS::TripleO::Services::CertmongerUser: puppet/services/certmonger-user.yaml OS::TripleO::Services::Clustercheck: OS::Heat::None OS::TripleO::Services::RsyslogSidecar: OS::Heat::None diff --git a/roles/Controller.yaml b/roles/Controller.yaml index 99068c29a0..c1490bee91 100644 --- a/roles/Controller.yaml +++ b/roles/Controller.yaml @@ -66,6 +66,7 @@ - OS::TripleO::Services::Clustercheck - OS::TripleO::Services::Collectd - OS::TripleO::Services::Congress + - OS::TripleO::Services::ContainerImagePrepare - OS::TripleO::Services::DesignateApi - OS::TripleO::Services::DesignateCentral - OS::TripleO::Services::DesignateProducer diff --git a/roles/ControllerNoCeph.yaml b/roles/ControllerNoCeph.yaml index 4cbd1de4f9..edbe52f38b 100644 --- a/roles/ControllerNoCeph.yaml +++ b/roles/ControllerNoCeph.yaml @@ -57,6 +57,7 @@ - OS::TripleO::Services::CinderScheduler - OS::TripleO::Services::CinderVolume - OS::TripleO::Services::Clustercheck + - OS::TripleO::Services::ContainerImagePrepare - OS::TripleO::Services::Collectd - OS::TripleO::Services::Congress - OS::TripleO::Services::DesignateApi diff --git a/roles_data.yaml b/roles_data.yaml index 2969c72aca..df49c13130 100644 --- a/roles_data.yaml +++ b/roles_data.yaml @@ -69,6 +69,7 @@ - OS::TripleO::Services::Clustercheck - OS::TripleO::Services::Collectd - OS::TripleO::Services::Congress + - OS::TripleO::Services::ContainerImagePrepare - OS::TripleO::Services::DesignateApi - OS::TripleO::Services::DesignateCentral - OS::TripleO::Services::DesignateProducer