openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Move docker into deployment directory"

Browse Source
This commit is contained in:
Zuul 2019-01-10 23:35:05 +00:00 committed by Gerrit Code Review
commit 2ca3c7c94c
10 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,6 @@ resource_registry:
OS::TripleO::Services::NovaScheduler: OS::Heat::None
OS::TripleO::Services::NovaCompute: OS::Heat::None
OS::TripleO::Services::NovaLibvirt: OS::Heat::None
OS::TripleO::Services::Docker: ../../puppet/services/docker.yaml

0
puppet/services/docker.yaml → deployment/docker/docker-baremetal-ansible.yaml
View File

0
puppet/services/docker-registry.yaml → deployment/docker/docker-registry-baremetal-ansible.yaml
View File

2
environments/docker-uc-light.yaml
View File

@ -1,6 +1,6 @@
# A lightweight UC for pre-provisioned deployed servers
resource_registry:
OS::TripleO::Services::Docker: ../puppet/services/docker.yaml
OS::TripleO::Services::Docker: ../deployment/docker/docker-baremetal-ansible.yaml
# Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2
# FIXME(bogdando): can not be switched yet due to puppet-base issues
# see https://review.openstack.org/#/c/563443

2
environments/kubernetes.yaml
View File

@ -1,4 +1,4 @@
resource_registry:
OS::TripleO::Services::Docker: ../puppet/services/docker.yaml
OS::TripleO::Services::Docker: ../deployment/docker/docker-baremetal-ansible.yaml
OS::TripleO::Services::Kubernetes::Worker: ../extraconfig/services/kubernetes-worker.yaml
OS::TripleO::Services::Kubernetes::Master: ../extraconfig/services/kubernetes-master.yaml

2
environments/openshift.yaml
View File

@ -1,5 +1,5 @@
resource_registry:
OS::TripleO::Services::Docker: ../puppet/services/docker.yaml
OS::TripleO::Services::Docker: ../deployment/docker/docker-baremetal-ansible.yaml
OS::TripleO::Services::HAproxy: ../docker/services/haproxy.yaml
OS::TripleO::Services::Keepalived: ../deployment/keepalived/keepalived-container-puppet.yaml
OS::TripleO::Services::OpenShift::Infra: ../extraconfig/services/openshift-infra.yaml

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

@ -77,7 +77,7 @@ resource_registry:
OS::TripleO::Services::DesignateProducer: OS::Heat::None
OS::TripleO::Services::DesignateSink: OS::Heat::None
OS::TripleO::Services::DesignateWorker: OS::Heat::None
OS::TripleO::Services::DockerRegistry: ../../puppet/services/docker-registry.yaml
OS::TripleO::Services::DockerRegistry: ../../deployment/docker/docker-registry-baremetal-ansible.yaml
OS::TripleO::Services::GnocchiApi: OS::Heat::None
OS::TripleO::Services::GnocchiMetricd: OS::Heat::None
OS::TripleO::Services::GnocchiStatsd: OS::Heat::None

2
environments/undercloud.yaml
View File

@ -3,7 +3,7 @@ resource_registry:
OS::TripleO::Network::Ports::ControlPlaneVipPort: ../deployed-server/deployed-neutron-port.yaml
OS::TripleO::Undercloud::Net::SoftwareConfig: ../net-config-undercloud.yaml
OS::TripleO::NodeExtraConfigPost: ../extraconfig/post_deploy/undercloud_post.yaml
OS::TripleO::Services::DockerRegistry: ../puppet/services/docker-registry.yaml
OS::TripleO::Services::DockerRegistry: ../deployment/docker/docker-registry-baremetal-ansible.yaml
OS::TripleO::Services::ContainerImagePrepare: ../puppet/services/container-image-prepare.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

@ -310,7 +310,7 @@ resource_registry:
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::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::CertmongerUser: puppet/services/certmonger-user.yaml

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

@ -65,8 +65,8 @@ environments:
# Activate container image prepare
OS::TripleO::Services::ContainerImagePrepare: ../../puppet/services/container-image-prepare.yaml
OS::TripleO::Services::DockerRegistry: ../../puppet/services/docker-registry.yaml
OS::TripleO::Services::Podman: ../../deployment/podman/podman-baremetal-ansible.yaml
OS::TripleO::Services::DockerRegistry: ../../deployment/docker/docker-registry-baremetal-ansible.yaml
# Disable non-openstack services that are enabled by default
OS::TripleO::Services::HAproxy: OS::Heat::None