Merge "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"
This commit is contained in:
commit
2f85520a6f
@ -1,4 +1,5 @@
|
|||||||
- id: PLUMgrid-Gateway
|
- id: PLUMgrid-Gateway
|
||||||
|
version: 2.0.0
|
||||||
type: group
|
type: group
|
||||||
role: [PLUMgrid-Gateway]
|
role: [PLUMgrid-Gateway]
|
||||||
tasks: [hiera, globals, logging, tools, netconfig]
|
tasks: [hiera, globals, logging, tools, netconfig]
|
||||||
@ -10,33 +11,46 @@
|
|||||||
|
|
||||||
# Skip default neutron plugins
|
# Skip default neutron plugins
|
||||||
- id: primary-openstack-network-plugins-l2
|
- id: primary-openstack-network-plugins-l2
|
||||||
|
version: 2.0.0
|
||||||
type: skipped
|
type: skipped
|
||||||
- id: openstack-network-plugins-l2
|
- id: openstack-network-plugins-l2
|
||||||
|
version: 2.0.0
|
||||||
type: skipped
|
type: skipped
|
||||||
- id: openstack-network-routers-ha
|
- id: openstack-network-routers-ha
|
||||||
|
version: 2.0.0
|
||||||
type: skipped
|
type: skipped
|
||||||
# Skip Neutron agents
|
# Skip Neutron agents
|
||||||
- id: primary-openstack-network-agents-l3
|
- id: primary-openstack-network-agents-l3
|
||||||
|
version: 2.0.0
|
||||||
type: skipped
|
type: skipped
|
||||||
- id: openstack-network-agents-l3
|
- id: openstack-network-agents-l3
|
||||||
|
version: 2.0.0
|
||||||
type: skipped
|
type: skipped
|
||||||
- id: primary-openstack-network-agents-dhcp
|
- id: primary-openstack-network-agents-dhcp
|
||||||
|
version: 2.0.0
|
||||||
type: skipped
|
type: skipped
|
||||||
- id: openstack-network-agents-dhcp
|
- id: openstack-network-agents-dhcp
|
||||||
|
version: 2.0.0
|
||||||
type: skipped
|
type: skipped
|
||||||
- id: primary-openstack-network-agents-metadata
|
- id: primary-openstack-network-agents-metadata
|
||||||
|
version: 2.0.0
|
||||||
type: skipped
|
type: skipped
|
||||||
- id: openstack-network-agents-metadata
|
- id: openstack-network-agents-metadata
|
||||||
|
version: 2.0.0
|
||||||
type: skipped
|
type: skipped
|
||||||
- id: openstack-network-agents-sriov
|
- id: openstack-network-agents-sriov
|
||||||
|
version: 2.0.0
|
||||||
type: skipped
|
type: skipped
|
||||||
# Skip default fuel networks and routers
|
# Skip default fuel networks and routers
|
||||||
- id: openstack-network-networks
|
- id: openstack-network-networks
|
||||||
|
version: 2.0.0
|
||||||
type: skipped
|
type: skipped
|
||||||
- id: openstack-network-routers
|
- id: openstack-network-routers
|
||||||
|
version: 2.0.0
|
||||||
type: skipped
|
type: skipped
|
||||||
|
|
||||||
- id: disable-openvswitch
|
- id: disable-openvswitch
|
||||||
|
version: 2.0.0
|
||||||
groups: ['controller', 'compute', 'PLUMgrid-Gateway', 'primary-controller']
|
groups: ['controller', 'compute', 'PLUMgrid-Gateway', 'primary-controller']
|
||||||
required_for: [netconfig, deploy_end]
|
required_for: [netconfig, deploy_end]
|
||||||
requires: [deploy_start, globals]
|
requires: [deploy_start, globals]
|
||||||
@ -49,6 +63,7 @@
|
|||||||
timeout: 120
|
timeout: 120
|
||||||
|
|
||||||
- id: pgtools-support
|
- id: pgtools-support
|
||||||
|
version: 2.0.0
|
||||||
groups: ['controller', 'primary-controller']
|
groups: ['controller', 'primary-controller']
|
||||||
required_for: [post_deployment_end]
|
required_for: [post_deployment_end]
|
||||||
requires: [post_deployment_start]
|
requires: [post_deployment_start]
|
||||||
@ -59,6 +74,7 @@
|
|||||||
timeout: 3000
|
timeout: 3000
|
||||||
|
|
||||||
- id: check-pgzone
|
- id: check-pgzone
|
||||||
|
version: 2.0.0
|
||||||
groups: ['controller', 'compute', 'PLUMgrid-Gateway', 'primary-controller']
|
groups: ['controller', 'compute', 'PLUMgrid-Gateway', 'primary-controller']
|
||||||
required_for: [post_deployment_end, pg_common]
|
required_for: [post_deployment_end, pg_common]
|
||||||
requires: [post_deployment_start]
|
requires: [post_deployment_start]
|
||||||
@ -69,6 +85,7 @@
|
|||||||
timeout: 720
|
timeout: 720
|
||||||
|
|
||||||
- id: pg_common
|
- id: pg_common
|
||||||
|
version: 2.0.0
|
||||||
groups: ['controller', 'compute', 'PLUMgrid-Gateway', 'primary-controller']
|
groups: ['controller', 'compute', 'PLUMgrid-Gateway', 'primary-controller']
|
||||||
required_for: [post_deployment_end, setup-director]
|
required_for: [post_deployment_end, setup-director]
|
||||||
requires: [post_deployment_start, check-pgzone, configure_default_route]
|
requires: [post_deployment_start, check-pgzone, configure_default_route]
|
||||||
@ -79,6 +96,7 @@
|
|||||||
timeout: 3000
|
timeout: 3000
|
||||||
|
|
||||||
- id: setup-director
|
- id: setup-director
|
||||||
|
version: 2.0.0
|
||||||
groups: ['controller', 'primary-controller']
|
groups: ['controller', 'primary-controller']
|
||||||
required_for: [post_deployment_end, director-fixes]
|
required_for: [post_deployment_end, director-fixes]
|
||||||
requires: [post_deployment_start, pg_common]
|
requires: [post_deployment_start, pg_common]
|
||||||
@ -89,6 +107,7 @@
|
|||||||
timeout: 3000
|
timeout: 3000
|
||||||
|
|
||||||
- id: director-fixes
|
- id: director-fixes
|
||||||
|
version: 2.0.0
|
||||||
groups: ['controller', 'primary-controller']
|
groups: ['controller', 'primary-controller']
|
||||||
required_for: [post_deployment_end, post_pg_license]
|
required_for: [post_deployment_end, post_pg_license]
|
||||||
requires: [post_deployment_start, setup-director]
|
requires: [post_deployment_start, setup-director]
|
||||||
@ -98,25 +117,28 @@
|
|||||||
puppet_modules: puppet/modules:/etc/puppet/modules
|
puppet_modules: puppet/modules:/etc/puppet/modules
|
||||||
timeout: 3000
|
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
|
- id: solution-api
|
||||||
|
version: 2.0.0
|
||||||
role: ['primary-controller']
|
role: ['primary-controller']
|
||||||
required_for: [post_deployment_end, setup-edge]
|
required_for: [post_deployment_end, post_pg_license]
|
||||||
requires: [post_deployment_start, post_pg_license]
|
requires: [post_deployment_start, director-fixes]
|
||||||
type: shell
|
type: shell
|
||||||
parameters:
|
parameters:
|
||||||
cmd: bash solution_api.sh
|
cmd: bash solution_api.sh
|
||||||
timeout: 3000
|
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
|
- id: setup-edge
|
||||||
|
version: 2.0.0
|
||||||
groups: ['compute']
|
groups: ['compute']
|
||||||
required_for: [post_deployment_end]
|
required_for: [post_deployment_end]
|
||||||
requires: [post_deployment_start, solution-api, pg_common]
|
requires: [post_deployment_start, solution-api, pg_common]
|
||||||
@ -127,6 +149,7 @@
|
|||||||
timeout: 3000
|
timeout: 3000
|
||||||
|
|
||||||
- id: setup-gateway
|
- id: setup-gateway
|
||||||
|
version: 2.0.0
|
||||||
groups: ['PLUMgrid-Gateway']
|
groups: ['PLUMgrid-Gateway']
|
||||||
required_for: [post_deployment_end]
|
required_for: [post_deployment_end]
|
||||||
requires: [post_deployment_start, solution-api, pg_common]
|
requires: [post_deployment_start, solution-api, pg_common]
|
||||||
|
@ -3,5 +3,3 @@ PLUMgrid-Gateway:
|
|||||||
description: "External Connectivity using PLUMgrid"
|
description: "External Connectivity using PLUMgrid"
|
||||||
conflicts:
|
conflicts:
|
||||||
- compute
|
- compute
|
||||||
limits:
|
|
||||||
min: 1
|
|
||||||
|
@ -1,6 +0,0 @@
|
|||||||
- role: '*'
|
|
||||||
stage: pre_deployment
|
|
||||||
type: shell
|
|
||||||
parameters:
|
|
||||||
cmd: echo OK
|
|
||||||
timeout: 30
|
|
Loading…
Reference in New Issue
Block a user