Merge "puppet: wire in osfamily hieradata support"

puppet/ceph-storage-puppet.yaml

@@ -63,6 +63,7 @@ resources:
             - cephstorage
             - ceph_cluster # provided by CephClusterConfig
             - ceph
+            - '"%{::osfamily}"'
             - common
           datafiles:
             common:

puppet/cinder-storage-puppet.yaml

@@ -163,6 +163,7 @@ resources:
           hierarchy:
             - heat_config_%{::deploy_config_name}
             - volume
+            - '"%{::osfamily}"'
             - common
           datafiles:
             common:

puppet/compute-puppet.yaml

@@ -287,6 +287,7 @@ resources:
             - compute
             - ceph_cluster # provided by CephClusterConfig
             - ceph
+            - '"%{::osfamily}"'
             - common
           datafiles:
             common:

puppet/controller-puppet.yaml

@@ -608,6 +608,7 @@ resources:
             - ceph
             - bootstrap_node # provided by BootstrapNodeConfig
             - all_nodes # provided by allNodesConfig
+            - '"%{::osfamily}"'
             - common
           datafiles:
             common:

puppet/hieradata/RedHat.yaml

@@ -0,0 +1,2 @@
+# RedHat specific overrides go here
+rabbitmq::package_provider: 'yum'

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'),

puppet/swift-storage-puppet.yaml

@@ -73,6 +73,7 @@ resources:
           hierarchy:
             - heat_config_%{::deploy_config_name}
             - object
+            - '"%{::osfamily}"'
             - common
           datafiles:
             common: