From: Jenkins Date: Tue, 22 Aug 2017 11:50:51 +0000 (+0000) Subject: Merge "Add nova metadata to TLS everywhere/docker services list" X-Git-Tag: opnfv-6.0.0~204 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=55383ffac624964b6921ec6706cfc97f495af2d4;p=apex-tripleo-heat-templates.git Merge "Add nova metadata to TLS everywhere/docker services list" --- 55383ffac624964b6921ec6706cfc97f495af2d4 diff --cc environments/docker-services-tls-everywhere.yaml index 19a43623,4d800560..e15cc3e3 --- a/environments/docker-services-tls-everywhere.yaml +++ b/environments/docker-services-tls-everywhere.yaml @@@ -21,9 -22,9 +22,10 @@@ resource_registry OS::TripleO::Services::HeatApi: ../docker/services/heat-api.yaml OS::TripleO::Services::HeatApiCfn: ../docker/services/heat-api-cfn.yaml OS::TripleO::Services::HeatEngine: ../docker/services/heat-engine.yaml + OS::TripleO::Services::Horizon: ../docker/services/horizon.yaml OS::TripleO::Services::Keystone: ../docker/services/keystone.yaml OS::TripleO::Services::Memcached: ../docker/services/memcached.yaml + OS::TripleO::Services::MySQL: ../docker/services/database/mysql.yaml OS::TripleO::Services::NeutronApi: ../docker/services/neutron-api.yaml OS::TripleO::Services::NeutronCorePlugin: ../docker/services/neutron-plugin-ml2.yaml OS::TripleO::Services::NeutronDhcpAgent: ../docker/services/neutron-dhcp.yaml