Merge "Add vnf, tag create & Associate Plugins"

[releng.git] / prototypes / puppet-infracloud / modules / opnfv / manifests / server.pp

diff --git a/prototypes/puppet-infracloud/modules/opnfv/manifests/server.pp b/prototypes/puppet-infracloud/modules/opnfv/manifests/server.pp
index 6b608a7..d167973 100644 (file)
--- a/prototypes/puppet-infracloud/modules/opnfv/manifests/server.pp
+++ b/prototypes/puppet-infracloud/modules/opnfv/manifests/server.pp
@@ -22,7 +22,7 @@ class opnfv::server (
 
   class { 'iptables':
     public_tcp_ports => $iptables_public_tcp_ports,
-    public_udp_ports => $all_udp,
+    public_udp_ports => $iptables_public_udp_ports,
     rules4           => $iptables_rules4,
     rules6           => $iptables_rules6,
   }
@@ -239,13 +239,6 @@ class opnfv::server (
     multiple => true,
   }
 
-  # disable selinux in case of RHEL
-  if ($::osfamily == 'RedHat') {
-    class { 'selinux':
-      mode => 'disabled',
-    }
-  }
-
   # update hosts
   create_resources('host', hiera_hash('hosts'))
 }