summaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-05-12 18:55:34 +0000
committerGerrit Code Review <review@openstack.org>2017-05-12 18:55:34 +0000
commit0bf3c7ebb85536d1b90c73e54a0d7fc61aae989b (patch)
treef6cb1f89712c50fd16d95b2131fdf36fe7905282 /environments
parentb7b886ab242145f56ba413cb88567e76e23cc464 (diff)
parent71efc9fcecf7b9b6939a3f8a9a8a1ab0c6d702e8 (diff)
Merge "docker/internal TLS: spawn extra container for glance API's TLS proxy"
Diffstat (limited to 'environments')
-rw-r--r--environments/docker-services-tls-everywhere.yaml3
1 files changed, 2 insertions, 1 deletions
diff --git a/environments/docker-services-tls-everywhere.yaml b/environments/docker-services-tls-everywhere.yaml
index 9bdbe2bd..33afbc66 100644
--- a/environments/docker-services-tls-everywhere.yaml
+++ b/environments/docker-services-tls-everywhere.yaml
@@ -12,6 +12,7 @@ resource_registry:
OS::TripleO::Services::AodhEvaluator: ../docker/services/aodh-evaluator.yaml
OS::TripleO::Services::AodhListener: ../docker/services/aodh-listener.yaml
OS::TripleO::Services::AodhNotifier: ../docker/services/aodh-notifier.yaml
+ OS::TripleO::Services::GlanceApi: ../docker/services/glance-api.yaml
OS::TripleO::Services::GnocchiApi: ../docker/services/gnocchi-api.yaml
OS::TripleO::Services::GnocchiMetricd: ../docker/services/gnocchi-metricd.yaml
OS::TripleO::Services::GnocchiStatsd: ../docker/services/gnocchi-statsd.yaml
@@ -21,8 +22,8 @@ resource_registry:
OS::TripleO::Services::Keystone: ../docker/services/keystone.yaml
OS::TripleO::Services::PankoApi: ../docker/services/panko-api.yaml
OS::TripleO::Services::SwiftProxy: ../docker/services/swift-proxy.yaml
- OS::TripleO::Services::SwiftStorage: ../docker/services/swift-storage.yaml
OS::TripleO::Services::SwiftRingBuilder: ../docker/services/swift-ringbuilder.yaml
+ OS::TripleO::Services::SwiftStorage: ../docker/services/swift-storage.yaml
OS::TripleO::PostDeploySteps: ../docker/post.yaml
OS::TripleO::PostUpgradeSteps: ../docker/post-upgrade.yaml