diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-28 11:08:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-28 11:08:34 +0000 |
| commit | 3e1e74d5e84af76bf4c595662dbcb77441407375 (patch) | |
| tree | fbb0c43dad88d8a8e48aec996973b29f4dc528aa /overcloud-resource-registry-puppet.j2.yaml | |
| parent | a32d101af96a9cee5f07977894de2d496a5b5a70 (diff) | |
| parent | 7d0f27980dd60f4274f353fe7594905d1de45b13 (diff) | |
Merge "Apache: Use conditional instead of nested stack for TLS-specific bits"
Diffstat (limited to 'overcloud-resource-registry-puppet.j2.yaml')
| -rw-r--r-- | overcloud-resource-registry-puppet.j2.yaml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 5debed5c..1c9830de 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -120,7 +120,6 @@ resource_registry: # services OS::TripleO::Services: puppet/services/services.yaml OS::TripleO::Services::Apache: puppet/services/apache.yaml - OS::TripleO::Services::ApacheTLS: OS::Heat::None OS::TripleO::Services::CACerts: puppet/services/ca-certs.yaml OS::TripleO::Services::CephMds: OS::Heat::None OS::TripleO::Services::CephMon: OS::Heat::None |