Browse Source

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>
Muhammad Shahzeb 2 years ago
parent
commit
d9e545e435
3 changed files with 29 additions and 14 deletions
  1. 29
    6
      deployment_tasks.yaml
  2. 0
    2
      node_roles.yaml
  3. 0
    6
      tasks.yaml

+ 29
- 6
deployment_tasks.yaml View File

@@ -1,4 +1,5 @@
1 1
 - id: PLUMgrid-Gateway
2
+  version: 2.0.0
2 3
   type: group
3 4
   role: [PLUMgrid-Gateway]
4 5
   tasks: [hiera, globals, logging, tools, netconfig]
@@ -10,33 +11,46 @@
10 11
 
11 12
 # Skip default neutron plugins
12 13
 - id: primary-openstack-network-plugins-l2
14
+  version: 2.0.0
13 15
   type: skipped
14 16
 - id: openstack-network-plugins-l2
17
+  version: 2.0.0
15 18
   type: skipped
16 19
 - id: openstack-network-routers-ha
20
+  version: 2.0.0
17 21
   type: skipped
18 22
 # Skip Neutron agents
19 23
 - id: primary-openstack-network-agents-l3
24
+  version: 2.0.0
20 25
   type: skipped
21 26
 - id: openstack-network-agents-l3
27
+  version: 2.0.0
22 28
   type: skipped
23 29
 - id: primary-openstack-network-agents-dhcp
30
+  version: 2.0.0
24 31
   type: skipped
25 32
 - id: openstack-network-agents-dhcp
33
+  version: 2.0.0
26 34
   type: skipped
27 35
 - id: primary-openstack-network-agents-metadata
36
+  version: 2.0.0
28 37
   type: skipped
29 38
 - id: openstack-network-agents-metadata
39
+  version: 2.0.0
30 40
   type: skipped
31 41
 - id: openstack-network-agents-sriov
42
+  version: 2.0.0
32 43
   type: skipped
33 44
 # Skip default fuel networks and routers
34 45
 - id: openstack-network-networks
46
+  version: 2.0.0
35 47
   type: skipped
36 48
 - id: openstack-network-routers
49
+  version: 2.0.0
37 50
   type: skipped
38 51
 
39 52
 - id: disable-openvswitch
53
+  version: 2.0.0
40 54
   groups: ['controller', 'compute', 'PLUMgrid-Gateway', 'primary-controller']
41 55
   required_for: [netconfig, deploy_end]
42 56
   requires: [deploy_start, globals]
@@ -49,6 +63,7 @@
49 63
     timeout: 120
50 64
 
51 65
 - id: pgtools-support
66
+  version: 2.0.0
52 67
   groups: ['controller', 'primary-controller']
53 68
   required_for: [post_deployment_end]
54 69
   requires: [post_deployment_start]
@@ -59,6 +74,7 @@
59 74
     timeout: 3000
60 75
 
61 76
 - id: check-pgzone
77
+  version: 2.0.0
62 78
   groups: ['controller', 'compute', 'PLUMgrid-Gateway', 'primary-controller']
63 79
   required_for: [post_deployment_end, pg_common]
64 80
   requires: [post_deployment_start]
@@ -69,6 +85,7 @@
69 85
     timeout: 720
70 86
 
71 87
 - id: pg_common
88
+  version: 2.0.0
72 89
   groups: ['controller', 'compute', 'PLUMgrid-Gateway', 'primary-controller']
73 90
   required_for: [post_deployment_end, setup-director]
74 91
   requires: [post_deployment_start, check-pgzone, configure_default_route]
@@ -79,6 +96,7 @@
79 96
     timeout: 3000
80 97
 
81 98
 - id: setup-director
99
+  version: 2.0.0
82 100
   groups: ['controller', 'primary-controller']
83 101
   required_for: [post_deployment_end, director-fixes]
84 102
   requires: [post_deployment_start, pg_common]
@@ -89,6 +107,7 @@
89 107
     timeout: 3000
90 108
 
91 109
 - id: director-fixes
110
+  version: 2.0.0
92 111
   groups: ['controller', 'primary-controller']
93 112
   required_for: [post_deployment_end, post_pg_license]
94 113
   requires: [post_deployment_start, setup-director]
@@ -98,25 +117,28 @@
98 117
     puppet_modules: puppet/modules:/etc/puppet/modules
99 118
     timeout: 3000
100 119
 
101
-- id: post_pg_license
120
+- id: solution-api
121
+  version: 2.0.0
102 122
   role: ['primary-controller']
103
-  required_for: [post_deployment_end, solution-api]
123
+  required_for: [post_deployment_end, post_pg_license]
104 124
   requires: [post_deployment_start, director-fixes]
105 125
   type: shell
106 126
   parameters:
107
-    cmd: bash post_pg_license.sh
127
+    cmd: bash solution_api.sh
108 128
     timeout: 3000
109 129
 
110
-- id: solution-api
130
+- id: post_pg_license
131
+  version: 2.0.0
111 132
   role: ['primary-controller']
112 133
   required_for: [post_deployment_end, setup-edge]
113
-  requires: [post_deployment_start, post_pg_license]
134
+  requires: [post_deployment_start, solution-api]
114 135
   type: shell
115 136
   parameters:
116
-    cmd: bash solution_api.sh
137
+    cmd: bash post_pg_license.sh
117 138
     timeout: 3000
118 139
 
119 140
 - id: setup-edge
141
+  version: 2.0.0
120 142
   groups: ['compute']
121 143
   required_for: [post_deployment_end]
122 144
   requires: [post_deployment_start, solution-api, pg_common]
@@ -127,6 +149,7 @@
127 149
     timeout: 3000
128 150
 
129 151
 - id: setup-gateway
152
+  version: 2.0.0
130 153
   groups: ['PLUMgrid-Gateway']
131 154
   required_for: [post_deployment_end]
132 155
   requires: [post_deployment_start, solution-api, pg_common]

+ 0
- 2
node_roles.yaml View File

@@ -3,5 +3,3 @@ PLUMgrid-Gateway:
3 3
   description: "External Connectivity using PLUMgrid"
4 4
   conflicts:
5 5
     - compute
6
-  limits:
7
-    min: 1

+ 0
- 6
tasks.yaml View File

@@ -1,6 +0,0 @@
1
-- role: '*'
2
-  stage: pre_deployment
3
-  type: shell
4
-  parameters:
5
-    cmd: echo OK
6
-    timeout: 30

Loading…
Cancel
Save