aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
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
parentbac7f95043b85deabba27833b489a0162703c9b5 (diff)
parent5009cc64322e9fb5723799eb9fbd79076a2dc5da (diff)
Merge "puppet: wire in osfamily hieradata support"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/ceph-storage-puppet.yaml1
-rw-r--r--puppet/cinder-storage-puppet.yaml1
-rw-r--r--puppet/compute-puppet.yaml1
-rw-r--r--puppet/controller-puppet.yaml1
-rw-r--r--puppet/hieradata/RedHat.yaml2
-rw-r--r--puppet/manifests/overcloud_controller.pp7
-rw-r--r--puppet/swift-storage-puppet.yaml1
7 files changed, 7 insertions, 7 deletions
diff --git a/puppet/ceph-storage-puppet.yaml b/puppet/ceph-storage-puppet.yaml
index 4a78da80..1599a323 100644
--- a/puppet/ceph-storage-puppet.yaml
+++ b/puppet/ceph-storage-puppet.yaml
@@ -63,6 +63,7 @@ resources:
- cephstorage
- ceph_cluster # provided by CephClusterConfig
- ceph
+ - '"%{::osfamily}"'
- common
datafiles:
common:
diff --git a/puppet/cinder-storage-puppet.yaml b/puppet/cinder-storage-puppet.yaml
index 0615ccc9..c7fd2ca0 100644
--- a/puppet/cinder-storage-puppet.yaml
+++ b/puppet/cinder-storage-puppet.yaml
@@ -163,6 +163,7 @@ resources:
hierarchy:
- heat_config_%{::deploy_config_name}
- volume
+ - '"%{::osfamily}"'
- common
datafiles:
common:
diff --git a/puppet/compute-puppet.yaml b/puppet/compute-puppet.yaml
index 5d2f8a94..382a6b53 100644
--- a/puppet/compute-puppet.yaml
+++ b/puppet/compute-puppet.yaml
@@ -287,6 +287,7 @@ resources:
- compute
- ceph_cluster # provided by CephClusterConfig
- ceph
+ - '"%{::osfamily}"'
- common
datafiles:
common:
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:
diff --git a/puppet/hieradata/RedHat.yaml b/puppet/hieradata/RedHat.yaml
new file mode 100644
index 00000000..f42c7159
--- /dev/null
+++ b/puppet/hieradata/RedHat.yaml
@@ -0,0 +1,2 @@
+# RedHat specific overrides go here
+rabbitmq::package_provider: 'yum'
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index e71adece..b08769ad 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -109,12 +109,6 @@ if hiera('step') >= 2 {
allowed_hosts => $allowed_hosts,
}
- if $::osfamily == 'RedHat' {
- $rabbit_provider = 'yum'
- } else {
- $rabbit_provider = undef
- }
-
Class['rabbitmq'] -> Rabbitmq_vhost <| |>
Class['rabbitmq'] -> Rabbitmq_user <| |>
Class['rabbitmq'] -> Rabbitmq_user_permissions <| |>
@@ -127,7 +121,6 @@ if hiera('step') >= 2 {
$rabbit_cluster = false
}
class { 'rabbitmq':
- package_provider => $rabbit_provider,
config_cluster => $rabbit_cluster,
cluster_nodes => $rabbit_nodes,
node_ip_address => hiera('controller_host'),
diff --git a/puppet/swift-storage-puppet.yaml b/puppet/swift-storage-puppet.yaml
index 9caa8485..6d446b00 100644
--- a/puppet/swift-storage-puppet.yaml
+++ b/puppet/swift-storage-puppet.yaml
@@ -73,6 +73,7 @@ resources:
hierarchy:
- heat_config_%{::deploy_config_name}
- object
+ - '"%{::osfamily}"'
- common
datafiles:
common: