aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/controller-puppet.yaml
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2015-02-12 21:54:57 -0500
committerGiulio Fidente <gfidente@redhat.com>2015-02-13 06:11:12 -0500
commitb639d3c7c28b6913da997b823452f33b9bd721c8 (patch)
treed72210a491662cdda844260c41c6fb1f9b6a9fc5 /puppet/controller-puppet.yaml
parentf98f2bdf4d2a0b78494c96627d8da47b92491ce1 (diff)
Split out allNodesConfig SoftwareConfig
This patch splits out the allNodesConfig config such that alternate implementation (puppet for example) can implement their own SoftwareConfig's via a nested stack. This is controlled by the standard overcloud heat environment. For os-apply-config deployments the implementation should work the same as before. For puppet deployments the implementation uses hiera metadata to configure rabbit_nodes. The puppet deployment doesn't support hosts, or freeform sysctl metadata yet so those are the same for now as well. Change-Id: I34ae30b1f37aca8b39586f7e350511462d66f694
Diffstat (limited to 'puppet/controller-puppet.yaml')
-rw-r--r--puppet/controller-puppet.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index 845b6b63..a4d68ff3 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -555,6 +555,7 @@ resources:
- controller
- object
- swift_devices_and_proxy # provided by SwiftDevicesAndProxyConfig
+ - rabbit # provided by allNodesConfig
- common
datafiles:
common: