Merge "dpdk: Create port and bridge after openvswitch service is configured"

lib/puppet/type/vs_bridge.rb

@@ -27,4 +27,8 @@ Puppet::Type.newtype(:vs_bridge) do
       end
     end
   end
+
+  autorequire(:service) do
+    ['openvswitch']
+  end
 end

lib/puppet/type/vs_port.rb

@@ -180,4 +180,8 @@ Puppet::Type.newtype(:vs_port) do
   autorequire(:vs_bridge) do
     self[:bridge] if self[:bridge]
   end
+
+  autorequire(:service) do
+    ['openvswitch']
+  end
 end

manifests/dpdk.pp

@@ -117,9 +117,8 @@ class vswitch::dpdk (
   }
 
   $dpdk_dependencies = {
-    wait    => false,
-    require => Service['openvswitch'],
-    notify  => Vs_config['other_config:dpdk-init'],
+    wait   => false,
+    notify => Vs_config['other_config:dpdk-init'],
   }
 
   if $enable_hw_offload {
@@ -162,9 +161,8 @@ class vswitch::dpdk (
   }
 
   vs_config { 'other_config:dpdk-init':
-    value   => true,
-    require => Service['openvswitch'],
-    wait    => true,
+    value => true,
+    wait  => true,
   }
 
   service { 'openvswitch':
@@ -181,8 +179,6 @@ class vswitch::dpdk (
     refreshonly => true,
   }
 
-  Service['openvswitch'] -> Vs_config<||>
-
   create_resources('vs_config', $dpdk_configs, $dpdk_dependencies)
   create_resources('vs_config', $vs_config)
 

manifests/ovs.pp

@@ -114,8 +114,4 @@ class vswitch::ovs(
     before => Service['openvswitch'],
     tag    => 'openvswitch',
   }
-
-  Service['openvswitch'] -> Vs_port<||>
-  Service['openvswitch'] -> Vs_bridge<||>
-  Service['openvswitch'] -> Vs_config<||>
 }