X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fmanifests%2Fovercloud_cephstorage.pp;h=2169002e8635526d543692393831a3dd0b30d11f;hb=c5ea6e699ca4ace0673ea30a23cb57d48849ccc6;hp=7f8970cc16e4d0905100d5af33a32c69d61763d1;hpb=7bae1ce8b0de5108e5219d2cadb712425eaf0f87;p=apex-tripleo-heat-templates.git

diff --git a/puppet/manifests/overcloud_cephstorage.pp b/puppet/manifests/overcloud_cephstorage.pp
index 7f8970cc..2169002e 100644
--- a/puppet/manifests/overcloud_cephstorage.pp
+++ b/puppet/manifests/overcloud_cephstorage.pp
@@ -16,28 +16,43 @@
 include ::tripleo::packages
 include ::tripleo::firewall
 
-create_resources(sysctl::value, hiera('sysctl_settings'), {})
+if hiera('step') >= 1 {
+
+  create_resources(kmod::load, hiera('kernel_modules'), {})
+  create_resources(sysctl::value, hiera('sysctl_settings'), {})
+  Exec <| tag == 'kmod::load' |>  -> Sysctl <| |>
 
-if count(hiera('ntp::servers')) > 0 {
-  include ::ntp
 }
 
-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'],
+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']
   }
 
-  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
 
-include ::ceph::profile::client
-include ::ceph::profile::osd
+  hiera_include('ceph_classes')
+}
 
-hiera_include('ceph_classes')
-package_manifest{'/var/lib/tripleo/installed-packages/overcloud_ceph': ensure => present}
+$package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_ceph', hiera('step')])
+package_manifest{$package_manifest_name: ensure => present}