openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Move container-image-prepare.j2.yaml to deployment dir 

Change-Id: Idf8eab2c0290c02908ffd3284543046cdf8aa5ba
This commit is contained in:
Steve Baker 2019-02-07 10:26:20 +13:00
parent a857fe1ad6
commit 2e899f3943
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
puppet/services/container-image-prepare.j2.yaml → deployment/container-image-prepare/container-image-prepare-baremetal-ansible.j2.yaml
View File

2
environments/standalone/standalone-tripleo.yaml
View File

@ -74,7 +74,7 @@ resource_registry:
OS::TripleO::Services::CeilometerAgentNotification: OS::Heat::None
OS::TripleO::Services::ComputeCeilometerAgent: OS::Heat::None
OS::TripleO::Services::Congress: OS::Heat::None
OS::TripleO::Services::ContainerImagePrepare: ../../puppet/services/container-image-prepare.yaml
OS::TripleO::Services::ContainerImagePrepare: ../../deployment/container-image-prepare/container-image-prepare-baremetal-ansible.yaml
OS::TripleO::Services::DesignateApi: OS::Heat::None
OS::TripleO::Services::DesignateCentral: OS::Heat::None
OS::TripleO::Services::DesignateMDNS: OS::Heat::None

2
environments/undercloud.yaml
View File

@ -4,7 +4,7 @@ resource_registry:
OS::TripleO::Undercloud::Net::SoftwareConfig: ../net-config-undercloud.yaml
OS::TripleO::NodeExtraConfigPost: ../extraconfig/post_deploy/undercloud_post.yaml
OS::TripleO::Services::DockerRegistry: ../deployment/docker/docker-registry-baremetal-ansible.yaml
OS::TripleO::Services::ContainerImagePrepare: ../puppet/services/container-image-prepare.yaml
OS::TripleO::Services::ContainerImagePrepare: ../deployment/container-image-prepare/container-image-prepare-baremetal-ansible.yaml
# Allows us to control the external VIP for Undercloud SSL
OS::TripleO::Network::Ports::ExternalVipPort: ../network/ports/external_from_pool.yaml

2
overcloud-resource-registry-puppet.j2.yaml
View File

@ -313,7 +313,7 @@ resource_registry:
OS::TripleO::Services::Podman: OS::Heat::None
OS::TripleO::Services::Docker: deployment/docker/docker-baremetal-ansible.yaml
OS::TripleO::Services::DockerRegistry: OS::Heat::None
OS::TripleO::Services::ContainerImagePrepare: puppet/services/container-image-prepare.yaml
OS::TripleO::Services::ContainerImagePrepare: deployment/container-image-prepare/container-image-prepare-baremetal-ansible.yaml
OS::TripleO::Services::CertmongerUser: puppet/services/certmonger-user.yaml
OS::TripleO::Services::Clustercheck: OS::Heat::None
OS::TripleO::Services::RsyslogSidecar: OS::Heat::None

2
sample-env-generator/standalone.yaml
View File

@ -68,7 +68,7 @@ environments:
OS::TripleO::Services::OpenStackClients: ../../puppet/services/openstack-clients.yaml
# Activate container image prepare
OS::TripleO::Services::ContainerImagePrepare: ../../puppet/services/container-image-prepare.yaml
OS::TripleO::Services::ContainerImagePrepare: ../../deployment/container-image-prepare/container-image-prepare-baremetal-ansible.yaml
OS::TripleO::Services::Podman: ../../deployment/podman/podman-baremetal-ansible.yaml
OS::TripleO::Services::DockerRegistry: ../../deployment/docker/docker-registry-baremetal-ansible.yaml

4
zuul.d/layout.yaml
View File

@ -13,9 +13,9 @@
files:
- ci/environments/scenario000-multinode-containers.yaml
- ^deployed-server/.*$
- ^deployment/container-image-prepare/.*$
- ^(docker|puppet)/services/.*ca-certs.*$
- ^(docker|puppet)/services/.*clustercheck.*$
- ^(docker|puppet)/services/.*container-image-prepare.*$
- ^(docker|puppet)/services/.*docker.*$
- ^(docker|puppet)/services/.*haproxy.*$
- ^(docker|puppet)/services/.*kernel.*$
@ -96,9 +96,9 @@
files:
- ci/environments/scenario000-multinode-containers.yaml
- ^deployed-server/.*$
- ^deployment/container-image-prepare/.*$
- ^(docker|puppet)/services/.*ca-certs.*$
- ^(docker|puppet)/services/.*clustercheck.*$
- ^(docker|puppet)/services/.*container-image-prepare.*$
- ^(docker|puppet)/services/.*docker.*$
- ^(docker|puppet)/services/.*haproxy.*$
- ^(docker|puppet)/services/.*kernel.*$