diff options
author | Giulio Fidente <gfidente@redhat.com> | 2016-06-02 02:55:08 +0200 |
---|---|---|
committer | Giulio Fidente <gfidente@redhat.com> | 2016-07-04 16:38:40 +0200 |
commit | 794fece5cc25d74ca0d874174e2c837a15750fbf (patch) | |
tree | 50457f9d1cb3a0ee770fb0faf90b27756c18da81 /puppet/manifests/overcloud_cephstorage.pp | |
parent | cbb6ae4e7bda60515e0ef85dff1028d038ec132d (diff) |
Switch Ceph Monitor/OSD/Client/External to composable roles
Change-Id: I1921115cb6218c7554348636c404245c79937673
Depends-On: I7ac096feb9f5655003becd79d2eea355a047c90b
Depends-On: I871ef420700e6d0ee5c1e444e019d58b3a9a45a6
Diffstat (limited to 'puppet/manifests/overcloud_cephstorage.pp')
-rw-r--r-- | puppet/manifests/overcloud_cephstorage.pp | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/puppet/manifests/overcloud_cephstorage.pp b/puppet/manifests/overcloud_cephstorage.pp index 2169002e..af6b0960 100644 --- a/puppet/manifests/overcloud_cephstorage.pp +++ b/puppet/manifests/overcloud_cephstorage.pp @@ -24,33 +24,7 @@ if hiera('step') >= 1 { } -if hiera('step') >= 3 { - if str2bool(hiera('ceph_osd_selinux_permissive', true)) { - exec { 'set selinux to permissive on boot': - command => "sed -ie 's/^SELINUX=.*/SELINUX=permissive/' /etc/selinux/config", - onlyif => "test -f /etc/selinux/config && ! grep '^SELINUX=permissive' /etc/selinux/config", - path => ['/usr/bin', '/usr/sbin'], - } - - exec { 'set selinux to permissive': - command => 'setenforce 0', - onlyif => "which setenforce && getenforce | grep -i 'enforcing'", - path => ['/usr/bin', '/usr/sbin'], - } -> Class['ceph::profile::osd'] - } - - if str2bool(hiera('ceph_ipv6', false)) { - $mon_host = hiera('ceph_mon_host_v6') - } else { - $mon_host = hiera('ceph_mon_host') - } - class { '::ceph::profile::params': - mon_host => $mon_host, - } - include ::ceph::conf - include ::ceph::profile::client - include ::ceph::profile::osd - +if hiera('step') >= 4 { hiera_include('ceph_classes') } |