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