diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-28 12:54:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-28 12:54:11 +0000 |
| commit | 3cce9cfa072ce343f6b203e4f1bb7dbd12622c92 (patch) | |
| tree | 988f842ab8b5e9ea9d42dbe1a62fb76520055c57 /overcloud-resource-registry-puppet.j2.yaml | |
| parent | 3e1e74d5e84af76bf4c595662dbcb77441407375 (diff) | |
| parent | 3bd4a3f94b471ec210630e85877a9eebabb69e72 (diff) | |
Merge "MySQL: 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 1c9830de..b294d7cb 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -143,7 +143,6 @@ resource_registry: OS::TripleO::Services::HeatEngine: puppet/services/heat-engine.yaml OS::TripleO::Services::Kernel: puppet/services/kernel.yaml OS::TripleO::Services::MySQL: puppet/services/database/mysql.yaml - OS::TripleO::Services::MySQLTLS: OS::Heat::None OS::TripleO::Services::NeutronBgpvpnApi: OS::Heat::None OS::TripleO::Services::NeutronDhcpAgent: puppet/services/neutron-dhcp.yaml OS::TripleO::Services::NeutronL3Agent: puppet/services/neutron-l3.yaml |