Merge "Split neutron tasks for task-based deployment"

deployment/puppet/osnailyfacter/modular/openstack-network/tasks.yaml

@@ -54,9 +54,9 @@
     puppet_modules: /etc/puppet/modules
     timeout: 1800
 
-- id: openstack-network-plugins-l2
+- id: primary-openstack-network-plugins-l2
   type: puppet
-  groups: [primary-controller,controller,compute]
+  groups: [primary-controller]
   required_for: [openstack-network-end]
   requires: [openstack-network-common-config, openstack-network-server-config]
   refresh_on: [neutron_plugin_ml2, neutron_agent_ovs, neutron_config, neutron_api_config]
@@ -65,11 +65,25 @@
     puppet_modules: /etc/puppet/modules
     timeout: 1800
 
+
+- id: openstack-network-plugins-l2
+  type: puppet
+  groups: [controller,compute]
+  required_for: [openstack-network-end]
+  requires: [openstack-network-common-config, openstack-network-server-config]
+  refresh_on: [neutron_plugin_ml2, neutron_agent_ovs, neutron_config, neutron_api_config]
+  cross-depends:
+    - name: primary-openstack-network-plugins-l2
+  parameters:
+    puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-network/plugins/ml2.pp
+    puppet_modules: /etc/puppet/modules
+    timeout: 1800
+
 - id: openstack-network-networks
   type: puppet
   groups: [primary-controller]
   required_for: [openstack-network-end]
-  requires: [openstack-network-plugins-l2]
+  requires: [primary-openstack-network-plugins-l2]
   parameters:
     puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-network/networks.pp
     puppet_modules: /etc/puppet/modules
@@ -100,12 +114,27 @@
     timeout: 1800
     cwd: /
 
+- id: primary-openstack-network-agents-l3
+  type: puppet
+  groups: [primary-controller]
+  required_for: [openstack-network-end]
+  requires: [openstack-network-networks, openstack-network-routers, primary-openstack-network-plugins-l2, openstack-network-plugins-l2]
+  refresh_on: [neutron_l3_agent_config]
+  parameters:
+    puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-network/agents/l3.pp
+    puppet_modules: /etc/puppet/modules
+    timeout: 1800
+
+
 - id: openstack-network-agents-l3
   type: puppet
-  groups: [primary-controller,controller,compute]
+  groups: [controller,compute]
   required_for: [openstack-network-end]
-  requires: [openstack-network-networks, openstack-network-routers, openstack-network-plugins-l2]
+  requires: [openstack-network-networks, openstack-network-routers, primary-openstack-network-plugins-l2, openstack-network-plugins-l2]
   refresh_on: [neutron_l3_agent_config]
+  cross-depends:
+    - name: /(primary-)?openstack-network-plugins-l2/
+    - name: primary-openstack-network-agents-l3
   parameters:
     puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-network/agents/l3.pp
     puppet_modules: /etc/puppet/modules
@@ -116,28 +145,66 @@
   groups: [primary-controller,controller]
   required_for: [openstack-network-end]
   requires: [openstack-network-agents-l3]
+  cross-depends:
+    - name: /(primary-)?openstack-network-agents-l3/
+    - name: /(primary-)?openstack-network-plugins-l2/
   parameters:
     puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-network/server-nova.pp
     puppet_modules: /etc/puppet/modules
     timeout: 1800
 
-- id: openstack-network-agents-dhcp
+- id: primary-openstack-network-agents-dhcp
   type: puppet
-  groups: [primary-controller,controller]
+  groups: [primary-controller]
   required_for: [openstack-network-end]
   requires: [openstack-network-common-config,openstack-network-server-nova,openstack-network-agents-l3]
   refresh_on: [neutron_dhcp_agent_config]
+  cross-depends:
+    - name: /(primary-)?openstack-network-plugins-l2/
   parameters:
     puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-network/agents/dhcp.pp
     puppet_modules: /etc/puppet/modules
     timeout: 1800
 
-- id: openstack-network-agents-metadata
+
+- id: openstack-network-agents-dhcp
   type: puppet
-  groups: [primary-controller,controller,compute]
+  groups: [controller]
+  required_for: [openstack-network-end]
+  requires: [openstack-network-common-config,openstack-network-server-nova,openstack-network-agents-l3]
+  refresh_on: [neutron_dhcp_agent_config]
+  cross-depends:
+    - name: primary-openstack-network-agents-dhcp
+    - name: /(primary-)?openstack-network-plugins-l2/
+  parameters:
+    puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-network/agents/dhcp.pp
+    puppet_modules: /etc/puppet/modules
+    timeout: 1800
+
+- id: primary-openstack-network-agents-metadata
+  type: puppet
+  groups: [primary-controller]
   required_for: [openstack-network-end]
   requires: [openstack-network-common-config,openstack-network-server-nova,openstack-network-agents-l3]
   refresh_on: [neutron_metadata_agent_config]
+  cross-depends:
+    - name: /(primary-)?openstack-network-plugins-l2/
+    - name: /(primary-)?openstack-network-agents-l3/
+  parameters:
+    puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-network/agents/metadata.pp
+    puppet_modules: /etc/puppet/modules
+    timeout: 1800
+
+
+- id: openstack-network-agents-metadata
+  type: puppet
+  groups: [controller,compute]
+  required_for: [openstack-network-end]
+  requires: [openstack-network-common-config,openstack-network-server-nova,openstack-network-agents-l3]
+  refresh_on: [neutron_metadata_agent_config]
+  cross-depends:
+    - name: primary-openstack-network-agents-metadata
+    - name: /(primary-)?openstack-network-plugins-l2/
   parameters:
     puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-network/agents/metadata.pp
     puppet_modules: /etc/puppet/modules
@@ -148,6 +215,8 @@
   groups: [compute]
   required_for: [openstack-network-end]
   requires: [openstack-network-common-config,openstack-network-agents-l3,openstack-network-agents-metadata]
+  cross-depends:
+    - name: /(primary-)?openstack-network-plugins-l2/
   parameters:
     puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-network/compute-nova.pp
     puppet_modules: /etc/puppet/modules