From d9e545e4353be1f4a50a6c3e8857bd5d4f8907ef Mon Sep 17 00:00:00 2001
From: Muhammad Shahzeb <mshahzeb@plumgrid.com>
Date: Mon, 31 Oct 2016 02:30:16 -0700
Subject: [PATCH] MOS 9 maintenance commit:  - Change order of solution api
 task and post pg licencse  - Remove minimum limit of 1 on gateway nodes  -
 Add version attribute to tasks  - Remove tasks.yaml file as it is not
 supported

Change-Id: I34c3726d214eeb54edc72864a3963a1974d9a607
Signed-off-by: Muhammad Shahzeb <mshahzeb@plumgrid.com>
---
 deployment_tasks.yaml | 45 ++++++++++++++++++++++++++++++++-----------
 node_roles.yaml       |  2 --
 tasks.yaml            |  6 ------
 3 files changed, 34 insertions(+), 19 deletions(-)
 delete mode 100644 tasks.yaml

diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
index db61a76..8d099ab 100644
--- a/deployment_tasks.yaml
+++ b/deployment_tasks.yaml
@@ -1,4 +1,5 @@
 - id: PLUMgrid-Gateway
+  version: 2.0.0
   type: group
   role: [PLUMgrid-Gateway]
   tasks: [hiera, globals, logging, tools, netconfig]
@@ -10,33 +11,46 @@
 
 # Skip default neutron plugins
 - id: primary-openstack-network-plugins-l2
+  version: 2.0.0
   type: skipped
 - id: openstack-network-plugins-l2
+  version: 2.0.0
   type: skipped
 - id: openstack-network-routers-ha
+  version: 2.0.0
   type: skipped
 # Skip Neutron agents
 - id: primary-openstack-network-agents-l3
+  version: 2.0.0
   type: skipped
 - id: openstack-network-agents-l3
+  version: 2.0.0
   type: skipped
 - id: primary-openstack-network-agents-dhcp
+  version: 2.0.0
   type: skipped
 - id: openstack-network-agents-dhcp
+  version: 2.0.0
   type: skipped
 - id: primary-openstack-network-agents-metadata
+  version: 2.0.0
   type: skipped
 - id: openstack-network-agents-metadata
+  version: 2.0.0
   type: skipped
 - id: openstack-network-agents-sriov
+  version: 2.0.0
   type: skipped
 # Skip default fuel networks and routers
 - id: openstack-network-networks
+  version: 2.0.0
   type: skipped
 - id: openstack-network-routers
+  version: 2.0.0
   type: skipped
 
 - id: disable-openvswitch
+  version: 2.0.0
   groups: ['controller', 'compute', 'PLUMgrid-Gateway', 'primary-controller']
   required_for: [netconfig, deploy_end]
   requires: [deploy_start, globals]
@@ -49,6 +63,7 @@
     timeout: 120
 
 - id: pgtools-support
+  version: 2.0.0
   groups: ['controller', 'primary-controller']
   required_for: [post_deployment_end]
   requires: [post_deployment_start]
@@ -59,6 +74,7 @@
     timeout: 3000
 
 - id: check-pgzone
+  version: 2.0.0
   groups: ['controller', 'compute', 'PLUMgrid-Gateway', 'primary-controller']
   required_for: [post_deployment_end, pg_common]
   requires: [post_deployment_start]
@@ -69,6 +85,7 @@
     timeout: 720
 
 - id: pg_common
+  version: 2.0.0
   groups: ['controller', 'compute', 'PLUMgrid-Gateway', 'primary-controller']
   required_for: [post_deployment_end, setup-director]
   requires: [post_deployment_start, check-pgzone, configure_default_route]
@@ -79,6 +96,7 @@
     timeout: 3000
 
 - id: setup-director
+  version: 2.0.0
   groups: ['controller', 'primary-controller']
   required_for: [post_deployment_end, director-fixes]
   requires: [post_deployment_start, pg_common]
@@ -89,6 +107,7 @@
     timeout: 3000
 
 - id: director-fixes
+  version: 2.0.0
   groups: ['controller', 'primary-controller']
   required_for: [post_deployment_end, post_pg_license]
   requires: [post_deployment_start, setup-director]
@@ -98,25 +117,28 @@
     puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 3000
 
-- id: post_pg_license
-  role: ['primary-controller']
-  required_for: [post_deployment_end, solution-api]
-  requires: [post_deployment_start, director-fixes]
-  type: shell
-  parameters:
-    cmd: bash post_pg_license.sh
-    timeout: 3000
-
 - id: solution-api
+  version: 2.0.0
   role: ['primary-controller']
-  required_for: [post_deployment_end, setup-edge]
-  requires: [post_deployment_start, post_pg_license]
+  required_for: [post_deployment_end, post_pg_license]
+  requires: [post_deployment_start, director-fixes]
   type: shell
   parameters:
     cmd: bash solution_api.sh
     timeout: 3000
 
+- id: post_pg_license
+  version: 2.0.0
+  role: ['primary-controller']
+  required_for: [post_deployment_end, setup-edge]
+  requires: [post_deployment_start, solution-api]
+  type: shell
+  parameters:
+    cmd: bash post_pg_license.sh
+    timeout: 3000
+
 - id: setup-edge
+  version: 2.0.0
   groups: ['compute']
   required_for: [post_deployment_end]
   requires: [post_deployment_start, solution-api, pg_common]
@@ -127,6 +149,7 @@
     timeout: 3000
 
 - id: setup-gateway
+  version: 2.0.0
   groups: ['PLUMgrid-Gateway']
   required_for: [post_deployment_end]
   requires: [post_deployment_start, solution-api, pg_common]
diff --git a/node_roles.yaml b/node_roles.yaml
index f292b97..21e05f0 100644
--- a/node_roles.yaml
+++ b/node_roles.yaml
@@ -3,5 +3,3 @@ PLUMgrid-Gateway:
   description: "External Connectivity using PLUMgrid"
   conflicts:
     - compute
-  limits:
-    min: 1
diff --git a/tasks.yaml b/tasks.yaml
deleted file mode 100644
index 75e743a..0000000
--- a/tasks.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- role: '*'
-  stage: pre_deployment
-  type: shell
-  parameters:
-    cmd: echo OK
-    timeout: 30