diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-06-10 08:54:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-06-10 08:54:15 +0000 |
| commit | dae80694cbd9dee56ea9a530c421b6a2f456a691 (patch) | |
| tree | d436a295ee66b089c4bc115e70ee183b8480d999 /overcloud-resource-registry-puppet.yaml | |
| parent | 697e00ffe010fbbafe6851605599c87e8a20d951 (diff) | |
| parent | 20c1b992beb47afba2faeec86083e65240cb4a4b (diff) | |
Merge "Replace no-op TLS stacks with OS::Heat::None"
Diffstat (limited to 'overcloud-resource-registry-puppet.yaml')
| -rw-r--r-- | overcloud-resource-registry-puppet.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml index 2fd48dda..a9b32e68 100644 --- a/overcloud-resource-registry-puppet.yaml +++ b/overcloud-resource-registry-puppet.yaml @@ -38,8 +38,8 @@ resource_registry: # NodeExtraConfig == All nodes configuration pre service deployment # NodeExtraConfigPost == All nodes configuration post service deployment OS::TripleO::NodeUserData: firstboot/userdata_default.yaml - OS::TripleO::NodeTLSCAData: puppet/extraconfig/tls/no-ca.yaml - OS::TripleO::NodeTLSData: puppet/extraconfig/tls/no-tls.yaml + OS::TripleO::NodeTLSCAData: OS::Heat::None + OS::TripleO::NodeTLSData: OS::Heat::None OS::TripleO::ControllerExtraConfigPre: puppet/extraconfig/pre_deploy/default.yaml OS::TripleO::ComputeExtraConfigPre: puppet/extraconfig/pre_deploy/default.yaml OS::TripleO::CephStorageExtraConfigPre: puppet/extraconfig/pre_deploy/default.yaml |