X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fmanifests%2Fovercloud_cephstorage.pp;h=7444155c42d887ab8a91bf7da19822c83a362220;hb=fe2133fa8bfface39bdf132b55b692ac349a85e1;hp=c0f19e23747046df86de9a930c0676a4ed80fe88;hpb=44a22fc61e24c2efc221edd7085c8f4d44b39fc0;p=apex-tripleo-heat-templates.git

diff --git a/puppet/manifests/overcloud_cephstorage.pp b/puppet/manifests/overcloud_cephstorage.pp
index c0f19e23..7444155c 100644
--- a/puppet/manifests/overcloud_cephstorage.pp
+++ b/puppet/manifests/overcloud_cephstorage.pp
@@ -13,23 +13,33 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-if !str2bool(hiera('enable_package_install', 'false')) {
-  case $::osfamily {
-    'RedHat': {
-      Package { provider => 'norpm' } # provided by tripleo-puppet
-    }
-    default: {
-      warning('enable_package_install option not supported.')
-    }
-  }
-}
+include ::tripleo::packages
+include ::tripleo::firewall
+
+create_resources(sysctl::value, hiera('sysctl_settings'), {})
 
 if count(hiera('ntp::servers')) > 0 {
   include ::ntp
 }
 
-class { 'ceph::profile::params':
-  mon_initial_members => downcase(hiera('ceph_mon_initial_members'))
+include ::timezone
+
+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']
 }
+
 include ::ceph::profile::client
-include ::ceph::profile::osd
\ No newline at end of file
+include ::ceph::profile::osd
+
+hiera_include('ceph_classes')
+package_manifest{'/var/lib/tripleo/installed-packages/overcloud_ceph': ensure => present}