diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-01-24 23:13:12 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-01-24 23:13:12 +0000 |
commit | f68362bfb914ec03cd541164d72956aff821ec93 (patch) | |
tree | d5309729d63929205da00a9088481c833541b7d5 /overcloud-resource-registry-puppet.j2.yaml | |
parent | 00938b0accff3a07954ff058e205f21a51583b56 (diff) | |
parent | a88261aa0542d1224cb6cb4bbd8eb6b546252bc8 (diff) |
Merge "Pass parameters for TLS proxy in front of Glance-API"
Diffstat (limited to 'overcloud-resource-registry-puppet.j2.yaml')
-rw-r--r-- | overcloud-resource-registry-puppet.j2.yaml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 47dfebb2..a5e43496 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -229,6 +229,7 @@ resource_registry: OS::TripleO::Services::ContrailControl: puppet/services/network/contrail-control.yaml OS::TripleO::Services::ContrailDatabase: puppet/services/network/contrail-database.yaml OS::TripleO::Services::ContrailWebui: puppet/services/network/contrail-webui.yaml + OS::TripleO::Services::TLSProxyBase: OS::Heat::None OS::TripleO::Services::Zaqar: OS::Heat::None OS::TripleO::Services::NeutronML2FujitsuCfab: OS::Heat::None OS::TripleO::Services::NeutronML2FujitsuFossw: OS::Heat::None |