Removed ODL_DOCKER implementation (DEPRECATED FOR PLUGIN ARCH IN FUEL 6.1/SR1 OF...

[genesis.git] / common / puppet-opnfv / manifests / init.pp

diff --git a/common/puppet-opnfv/manifests/init.pp b/common/puppet-opnfv/manifests/init.pp
index f1b4576..d26bd7a 100644 (file)
--- a/common/puppet-opnfv/manifests/init.pp
+++ b/common/puppet-opnfv/manifests/init.pp
@@ -14,17 +14,30 @@
 
 
 class opnfv {
-    exec {'disable selinux':
-        command => '/usr/sbin/setenforce 0',
-        unless => '/usr/sbin/getenforce | grep Permissive',
-    }
-    include stdlib
-    stage { 'presetup':
-      before => Stage['setup'],
+     if $::osfamily == 'Fuel' {
+       include opnfv::resolver
+       include opnfv::ntp
+       include opnfv::add_packages
+       include opnfv::opncheck
     }
 
-    class { "opnfv::repo":
-     stage => presetup,
-    }
+   if $::osfamily == 'RedHat' {
+
+       include stdlib
+       stage { 'presetup':
+               before => Stage['setup'],
+       }
+
+      class { '::ntp':
+        stage => presetup,
+      }
 
+       class { "opnfv::repo":
+               stage => presetup,
+       }
+      ->
+      package { "python-rados":
+        ensure => latest,
+      }
+   }
 }