X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fmanifests%2Fovercloud_cephstorage.pp;h=152694d93b3bbc14d7bf96e4cce881b73b61b756;hb=e75563319fa2984256ff569a6eb2e4e980d80f4f;hp=38b6a546ce6c6acf36451df62536045f23a850a4;hpb=9ab0050e6ec6ace2deb7712d7fde7a12bc466b75;p=apex-tripleo-heat-templates.git

diff --git a/puppet/manifests/overcloud_cephstorage.pp b/puppet/manifests/overcloud_cephstorage.pp
index 38b6a546..152694d9 100644
--- a/puppet/manifests/overcloud_cephstorage.pp
+++ b/puppet/manifests/overcloud_cephstorage.pp
@@ -13,38 +13,12 @@
 # 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.')
-    }
-  }
-}
-
-create_resources(sysctl::value, hiera('sysctl_settings'), {})
-
-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"],
-  }
+include ::tripleo::packages
+include ::tripleo::firewall
 
-  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 hiera('step') >= 4 {
+  hiera_include('ceph_classes')
 }
 
-include ::ceph::profile::client
-include ::ceph::profile::osd
-
-hiera_include('ceph_classes')
\ No newline at end of file
+$package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_ceph', hiera('step')])
+package_manifest{$package_manifest_name: ensure => present}