Browse Source

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
changes/19/581919/22
Steve Baker 3 years ago
committed by wes hayutin
parent
commit
93d87cf18d
22 changed files with 22 additions and 1 deletions
  1. +1
    -0
      ci/environments/multinode-3nodes.yaml
  2. +1
    -0
      ci/environments/multinode-containers.yaml
  3. +1
    -0
      ci/environments/multinode.yaml
  4. +1
    -0
      ci/environments/multinode_major_upgrade.yaml
  5. +1
    -0
      ci/environments/ovb-ha.yaml
  6. +1
    -0
      ci/environments/scenario000-multinode-containers.yaml
  7. +1
    -0
      ci/environments/scenario001-multinode-containers.yaml
  8. +1
    -0
      ci/environments/scenario002-multinode-containers.yaml
  9. +1
    -0
      ci/environments/scenario003-multinode-containers.yaml
  10. +1
    -0
      ci/environments/scenario004-multinode-containers.yaml
  11. +1
    -0
      ci/environments/scenario006-multinode-containers.yaml
  12. +1
    -0
      ci/environments/scenario006-multinode.yaml
  13. +1
    -0
      ci/environments/scenario007-multinode-containers.yaml
  14. +1
    -0
      ci/environments/scenario008-multinode-containers.yaml
  15. +1
    -0
      ci/environments/scenario009-multinode.yaml
  16. +1
    -0
      ci/environments/scenario010-multinode-containers.yaml
  17. +1
    -0
      ci/environments/scenario011-multinode-containers.yaml
  18. +1
    -0
      deployed-server/deployed-server-roles-data.yaml
  19. +1
    -1
      overcloud-resource-registry-puppet.j2.yaml
  20. +1
    -0
      roles/Controller.yaml
  21. +1
    -0
      roles/ControllerNoCeph.yaml
  22. +1
    -0
      roles_data.yaml

+ 1
- 0
ci/environments/multinode-3nodes.yaml View File

@ -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


+ 1
- 0
ci/environments/multinode-containers.yaml View File

@ -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


+ 1
- 0
ci/environments/multinode.yaml View File

@ -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


+ 1
- 0
ci/environments/multinode_major_upgrade.yaml View File

@ -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


+ 1
- 0
ci/environments/ovb-ha.yaml View File

@ -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


+ 1
- 0
ci/environments/scenario000-multinode-containers.yaml View File

@ -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


+ 1
- 0
ci/environments/scenario001-multinode-containers.yaml View File

@ -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


+ 1
- 0
ci/environments/scenario002-multinode-containers.yaml View File

@ -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


+ 1
- 0
ci/environments/scenario003-multinode-containers.yaml View File

@ -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


+ 1
- 0
ci/environments/scenario004-multinode-containers.yaml View File

@ -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


+ 1
- 0
ci/environments/scenario006-multinode-containers.yaml View File

@ -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


+ 1
- 0
ci/environments/scenario006-multinode.yaml View File

@ -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


+ 1
- 0
ci/environments/scenario007-multinode-containers.yaml View File

@ -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


+ 1
- 0
ci/environments/scenario008-multinode-containers.yaml View File

@ -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


+ 1
- 0
ci/environments/scenario009-multinode.yaml View File

@ -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


+ 1
- 0
ci/environments/scenario010-multinode-containers.yaml View File

@ -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


+ 1
- 0
ci/environments/scenario011-multinode-containers.yaml View File

@ -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


+ 1
- 0
deployed-server/deployed-server-roles-data.yaml View File

@ -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


+ 1
- 1
overcloud-resource-registry-puppet.j2.yaml View File

@ -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


+ 1
- 0
roles/Controller.yaml View File

@ -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


+ 1
- 0
roles/ControllerNoCeph.yaml View File

@ -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


+ 1
- 0
roles_data.yaml View File

@ -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


Loading…
Cancel
Save