aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud-resource-registry-puppet.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-07 09:44:20 +0000
committerGerrit Code Review <review@openstack.org>2016-07-07 09:44:20 +0000
commit4d876bffabb6cabd07b293cbe001d7982a0ecf69 (patch)
tree10fc69d2a57cdac81d31b749b464f12b11175a67 /overcloud-resource-registry-puppet.yaml
parent294c81c0b1cd7fa2a28114f3450bc014b3127489 (diff)
parentfe1f8a8c8644a2c27ee587a67fb4a738fd420dcf (diff)
Merge "Convert AllNodesExtraConfig to OS::Heat::None"
Diffstat (limited to 'overcloud-resource-registry-puppet.yaml')
-rw-r--r--overcloud-resource-registry-puppet.yaml3
1 files changed, 2 insertions, 1 deletions
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml
index b4dc57a5..8ec2a792 100644
--- a/overcloud-resource-registry-puppet.yaml
+++ b/overcloud-resource-registry-puppet.yaml
@@ -50,7 +50,8 @@ resource_registry:
# phase, e.g when puppet is applied, but after the pre_deploy phase. Useful when
# configuration with knowledge of all nodes in the cluster is required vs single
# node configuration in the pre_deploy step.
- OS::TripleO::AllNodesExtraConfig: extraconfig/all_nodes/default.yaml
+ # See extraconfig/all_nodes/* for examples
+ OS::TripleO::AllNodesExtraConfig: OS::Heat::None
# TripleO overcloud networks
OS::TripleO::Network: network/networks.yaml