openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "standalone: switch container registry to ImageServce"

This commit is contained in:
Zuul 2019-02-20 21:16:52 +00:00 committed by Gerrit Code Review
parent 09e1e65089 359e72b60c
commit 6f73f44a28
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,7 +81,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: ../../deployment/docker/docker-registry-baremetal-ansible.yaml
OS::TripleO::Services::DockerRegistry: ../../deployment/image-serve/image-serve-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
sample-env-generator/standalone.yaml
View File

@ -73,7 +73,7 @@ environments:
# Activate container image prepare
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
OS::TripleO::Services::DockerRegistry: ../../deployment/image-serve/image-serve-baremetal-ansible.yaml
# Disable non-openstack services that are enabled by default
OS::TripleO::Services::HAproxy: OS::Heat::None