summaryrefslogtreecommitdiffstats
path: root/puppet/controller-puppet.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-04-01 19:26:14 +0000
committerGerrit Code Review <review@openstack.org>2015-04-01 19:26:14 +0000
commit9bf344f4786e343f5670addf3819c87cf2bc484d (patch)
tree60368a87f8713bb40ebd1577abdcc992dca35263 /puppet/controller-puppet.yaml
parentbac7f95043b85deabba27833b489a0162703c9b5 (diff)
parent5009cc64322e9fb5723799eb9fbd79076a2dc5da (diff)
Merge "puppet: wire in osfamily hieradata support"
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 3bd69808..3c299895 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -608,6 +608,7 @@ resources:
- ceph
- bootstrap_node # provided by BootstrapNodeConfig
- all_nodes # provided by allNodesConfig
+ - '"%{::osfamily}"'
- common
datafiles:
common: