diff options
| -rw-r--r-- | puppet/ceph-storage-puppet.yaml | 1 | ||||
| -rw-r--r-- | puppet/cinder-storage-puppet.yaml | 1 | ||||
| -rw-r--r-- | puppet/compute-puppet.yaml | 1 | ||||
| -rw-r--r-- | puppet/controller-puppet.yaml | 1 | ||||
| -rw-r--r-- | puppet/hieradata/RedHat.yaml | 2 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 7 | ||||
| -rw-r--r-- | puppet/swift-storage-puppet.yaml | 1 |
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 104130b3..7fc72240 100644 --- a/puppet/cinder-storage-puppet.yaml +++ b/puppet/cinder-storage-puppet.yaml @@ -158,6 +158,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 a481a2e1..dc6d2891 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 295cb328..df965566 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: |