Move NeutronNetworkingTest from neutron-api
At present the neutron-api charm executes four gate tests per release combination to cover ML2, ML2+DVR, ML2+DVR+SNAT and OVN deployment scenarios. This adds up to over 12 hours runtime for a full test run. With this change we default to deploy the ML2+DVR+SNAT deployment scenario in the neutron-openvswitch gate test for xenial-queens and onwards so that we can remove this test from the neutron-api gate. Change-Id: I04922b758fccad8545afb28cdb715a413096589d Func-Test-Pr: https://github.com/openstack-charmers/zaza-openstack-tests/pull/237
This commit is contained in:
parent
af7fc7da20
commit
ab1a4b8aa1
125
tests/bundles/bionic-queens-dvr-snat.yaml
Normal file
125
tests/bundles/bionic-queens-dvr-snat.yaml
Normal file
@ -0,0 +1,125 @@
|
|||||||
|
variables:
|
||||||
|
openstack-origin: &openstack-origin distro
|
||||||
|
|
||||||
|
series: &series bionic
|
||||||
|
|
||||||
|
machines:
|
||||||
|
0:
|
||||||
|
constraints: "mem=3072M"
|
||||||
|
1: {}
|
||||||
|
2: {}
|
||||||
|
3: {}
|
||||||
|
4: {}
|
||||||
|
5: {}
|
||||||
|
6:
|
||||||
|
constraints: "root-disk=20G mem=4G"
|
||||||
|
7:
|
||||||
|
constraints: "root-disk=20G mem=4G"
|
||||||
|
|
||||||
|
# We specify machine placements for these to improve iteration
|
||||||
|
# time, given that machine "0" comes up way before machine "7"
|
||||||
|
applications:
|
||||||
|
percona-cluster:
|
||||||
|
charm: cs:~openstack-charmers-next/percona-cluster
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '0'
|
||||||
|
rabbitmq-server:
|
||||||
|
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '1'
|
||||||
|
neutron-api:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-api
|
||||||
|
series: *series
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
overlay-network-type: 'vxlan'
|
||||||
|
l2-population: True
|
||||||
|
flat-network-providers: physnet1
|
||||||
|
neutron-security-groups: true
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
enable-dvr: True
|
||||||
|
to:
|
||||||
|
- '2'
|
||||||
|
keystone:
|
||||||
|
charm: cs:~openstack-charmers-next/keystone
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '3'
|
||||||
|
glance:
|
||||||
|
charm: cs:~openstack-charmers-next/glance
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '4'
|
||||||
|
neutron-openvswitch:
|
||||||
|
charm: ../../../neutron-openvswitch
|
||||||
|
options:
|
||||||
|
use-dvr-snat: True
|
||||||
|
bridge-mappings: physnet1:br-ex
|
||||||
|
enable-local-dhcp-and-metadata: True
|
||||||
|
nova-cloud-controller:
|
||||||
|
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
network-manager: Neutron
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '5'
|
||||||
|
nova-compute:
|
||||||
|
charm: cs:~openstack-charmers-next/nova-compute
|
||||||
|
num_units: 2
|
||||||
|
options:
|
||||||
|
config-flags: default_ephemeral_format=ext4
|
||||||
|
enable-live-migration: true
|
||||||
|
enable-resize: true
|
||||||
|
migration-auth-type: ssh
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '6'
|
||||||
|
- '7'
|
||||||
|
relations:
|
||||||
|
- - 'neutron-api:shared-db'
|
||||||
|
- 'percona-cluster:shared-db'
|
||||||
|
- - 'neutron-api:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'neutron-api:neutron-api'
|
||||||
|
- 'nova-cloud-controller:neutron-api'
|
||||||
|
- - 'neutron-api:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
- - 'keystone:shared-db'
|
||||||
|
- 'percona-cluster:shared-db'
|
||||||
|
- - 'nova-compute:neutron-plugin'
|
||||||
|
- 'neutron-openvswitch:neutron-plugin'
|
||||||
|
- - 'neutron-api:neutron-plugin-api'
|
||||||
|
- 'neutron-openvswitch:neutron-plugin-api'
|
||||||
|
- - 'nova-cloud-controller:shared-db'
|
||||||
|
- 'percona-cluster:shared-db'
|
||||||
|
- - 'nova-cloud-controller:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'nova-compute:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'neutron-openvswitch:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'nova-cloud-controller:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
- - 'nova-cloud-controller:cloud-compute'
|
||||||
|
- 'nova-compute:cloud-compute'
|
||||||
|
- - 'glance:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
- - 'glance:shared-db'
|
||||||
|
- 'percona-cluster:shared-db'
|
||||||
|
- - 'glance:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'nova-compute:image-service'
|
||||||
|
- 'glance:image-service'
|
||||||
|
- - 'nova-cloud-controller:image-service'
|
||||||
|
- 'glance:image-service'
|
@ -1,89 +0,0 @@
|
|||||||
series: bionic
|
|
||||||
|
|
||||||
machines:
|
|
||||||
'0':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'1':
|
|
||||||
'2':
|
|
||||||
'3':
|
|
||||||
'4':
|
|
||||||
'5':
|
|
||||||
'6':
|
|
||||||
|
|
||||||
applications:
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers-next/nova-compute
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '1'
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
network-manager: Neutron
|
|
||||||
to:
|
|
||||||
- '2'
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
keystone:
|
|
||||||
num_units: 1
|
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers-next/glance
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers-next/neutron-api
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
percona-cluster:
|
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: ../../../neutron-openvswitch
|
|
||||||
|
|
||||||
relations:
|
|
||||||
- - 'neutron-openvswitch:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'neutron-openvswitch:neutron-plugin'
|
|
||||||
- 'nova-compute:neutron-plugin'
|
|
||||||
- - 'neutron-openvswitch:neutron-plugin-api'
|
|
||||||
- 'neutron-api:neutron-plugin-api'
|
|
||||||
- - 'neutron-api:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
- - 'neutron-api:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'neutron-api:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-compute:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-compute:image-service'
|
|
||||||
- 'glance:image-service'
|
|
||||||
- - 'glance:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
- - 'glance:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'glance:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'nova-cloud-controller:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'nova-cloud-controller:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-cloud-controller:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
- - 'nova-cloud-controller:cloud-compute'
|
|
||||||
- 'nova-compute:cloud-compute'
|
|
||||||
- - 'nova-cloud-controller:image-service'
|
|
||||||
- 'glance:image-service'
|
|
125
tests/bundles/bionic-rocky-dvr-snat.yaml
Normal file
125
tests/bundles/bionic-rocky-dvr-snat.yaml
Normal file
@ -0,0 +1,125 @@
|
|||||||
|
variables:
|
||||||
|
openstack-origin: &openstack-origin cloud:bionic-rocky
|
||||||
|
|
||||||
|
series: &series bionic
|
||||||
|
|
||||||
|
machines:
|
||||||
|
0:
|
||||||
|
constraints: "mem=3072M"
|
||||||
|
1: {}
|
||||||
|
2: {}
|
||||||
|
3: {}
|
||||||
|
4: {}
|
||||||
|
5: {}
|
||||||
|
6:
|
||||||
|
constraints: "root-disk=20G mem=4G"
|
||||||
|
7:
|
||||||
|
constraints: "root-disk=20G mem=4G"
|
||||||
|
|
||||||
|
# We specify machine placements for these to improve iteration
|
||||||
|
# time, given that machine "0" comes up way before machine "7"
|
||||||
|
applications:
|
||||||
|
percona-cluster:
|
||||||
|
charm: cs:~openstack-charmers-next/percona-cluster
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '0'
|
||||||
|
rabbitmq-server:
|
||||||
|
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '1'
|
||||||
|
neutron-api:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-api
|
||||||
|
series: *series
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
overlay-network-type: 'vxlan'
|
||||||
|
l2-population: True
|
||||||
|
flat-network-providers: physnet1
|
||||||
|
neutron-security-groups: true
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
enable-dvr: True
|
||||||
|
to:
|
||||||
|
- '2'
|
||||||
|
keystone:
|
||||||
|
charm: cs:~openstack-charmers-next/keystone
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '3'
|
||||||
|
glance:
|
||||||
|
charm: cs:~openstack-charmers-next/glance
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '4'
|
||||||
|
neutron-openvswitch:
|
||||||
|
charm: ../../../neutron-openvswitch
|
||||||
|
options:
|
||||||
|
use-dvr-snat: True
|
||||||
|
bridge-mappings: physnet1:br-ex
|
||||||
|
enable-local-dhcp-and-metadata: True
|
||||||
|
nova-cloud-controller:
|
||||||
|
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
network-manager: Neutron
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '5'
|
||||||
|
nova-compute:
|
||||||
|
charm: cs:~openstack-charmers-next/nova-compute
|
||||||
|
num_units: 2
|
||||||
|
options:
|
||||||
|
config-flags: default_ephemeral_format=ext4
|
||||||
|
enable-live-migration: true
|
||||||
|
enable-resize: true
|
||||||
|
migration-auth-type: ssh
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '6'
|
||||||
|
- '7'
|
||||||
|
relations:
|
||||||
|
- - 'neutron-api:shared-db'
|
||||||
|
- 'percona-cluster:shared-db'
|
||||||
|
- - 'neutron-api:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'neutron-api:neutron-api'
|
||||||
|
- 'nova-cloud-controller:neutron-api'
|
||||||
|
- - 'neutron-api:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
- - 'keystone:shared-db'
|
||||||
|
- 'percona-cluster:shared-db'
|
||||||
|
- - 'nova-compute:neutron-plugin'
|
||||||
|
- 'neutron-openvswitch:neutron-plugin'
|
||||||
|
- - 'neutron-api:neutron-plugin-api'
|
||||||
|
- 'neutron-openvswitch:neutron-plugin-api'
|
||||||
|
- - 'nova-cloud-controller:shared-db'
|
||||||
|
- 'percona-cluster:shared-db'
|
||||||
|
- - 'nova-cloud-controller:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'nova-compute:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'neutron-openvswitch:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'nova-cloud-controller:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
- - 'nova-cloud-controller:cloud-compute'
|
||||||
|
- 'nova-compute:cloud-compute'
|
||||||
|
- - 'glance:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
- - 'glance:shared-db'
|
||||||
|
- 'percona-cluster:shared-db'
|
||||||
|
- - 'glance:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'nova-compute:image-service'
|
||||||
|
- 'glance:image-service'
|
||||||
|
- - 'nova-cloud-controller:image-service'
|
||||||
|
- 'glance:image-service'
|
@ -1,98 +0,0 @@
|
|||||||
series: bionic
|
|
||||||
|
|
||||||
machines:
|
|
||||||
'0':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'1':
|
|
||||||
'2':
|
|
||||||
'3':
|
|
||||||
'4':
|
|
||||||
'5':
|
|
||||||
'6':
|
|
||||||
|
|
||||||
applications:
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers-next/nova-compute
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:bionic-rocky
|
|
||||||
to:
|
|
||||||
- '1'
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
network-manager: Neutron
|
|
||||||
openstack-origin: cloud:bionic-rocky
|
|
||||||
to:
|
|
||||||
- '2'
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
keystone:
|
|
||||||
num_units: 1
|
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:bionic-rocky
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers-next/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:bionic-rocky
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers-next/neutron-api
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:bionic-rocky
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
percona-cluster:
|
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: ../../../neutron-openvswitch
|
|
||||||
|
|
||||||
relations:
|
|
||||||
- - 'neutron-openvswitch:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'neutron-openvswitch:neutron-plugin'
|
|
||||||
- 'nova-compute:neutron-plugin'
|
|
||||||
- - 'neutron-openvswitch:neutron-plugin-api'
|
|
||||||
- 'neutron-api:neutron-plugin-api'
|
|
||||||
- - 'neutron-api:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
- - 'neutron-api:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'neutron-api:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-compute:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-compute:image-service'
|
|
||||||
- 'glance:image-service'
|
|
||||||
- - 'glance:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
- - 'glance:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'glance:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'nova-cloud-controller:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'nova-cloud-controller:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-cloud-controller:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
- - 'nova-cloud-controller:cloud-compute'
|
|
||||||
- 'nova-compute:cloud-compute'
|
|
||||||
- - 'nova-cloud-controller:image-service'
|
|
||||||
- 'glance:image-service'
|
|
125
tests/bundles/bionic-stein-dvr-snat.yaml
Normal file
125
tests/bundles/bionic-stein-dvr-snat.yaml
Normal file
@ -0,0 +1,125 @@
|
|||||||
|
variables:
|
||||||
|
openstack-origin: &openstack-origin cloud:bionic-stein
|
||||||
|
|
||||||
|
series: &series bionic
|
||||||
|
|
||||||
|
machines:
|
||||||
|
0:
|
||||||
|
constraints: "mem=3072M"
|
||||||
|
1: {}
|
||||||
|
2: {}
|
||||||
|
3: {}
|
||||||
|
4: {}
|
||||||
|
5: {}
|
||||||
|
6:
|
||||||
|
constraints: "root-disk=20G mem=4G"
|
||||||
|
7:
|
||||||
|
constraints: "root-disk=20G mem=4G"
|
||||||
|
|
||||||
|
# We specify machine placements for these to improve iteration
|
||||||
|
# time, given that machine "0" comes up way before machine "7"
|
||||||
|
applications:
|
||||||
|
percona-cluster:
|
||||||
|
charm: cs:~openstack-charmers-next/percona-cluster
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '0'
|
||||||
|
rabbitmq-server:
|
||||||
|
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '1'
|
||||||
|
neutron-api:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-api
|
||||||
|
series: *series
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
overlay-network-type: 'vxlan'
|
||||||
|
l2-population: True
|
||||||
|
flat-network-providers: physnet1
|
||||||
|
neutron-security-groups: true
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
enable-dvr: True
|
||||||
|
to:
|
||||||
|
- '2'
|
||||||
|
keystone:
|
||||||
|
charm: cs:~openstack-charmers-next/keystone
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '3'
|
||||||
|
glance:
|
||||||
|
charm: cs:~openstack-charmers-next/glance
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '4'
|
||||||
|
neutron-openvswitch:
|
||||||
|
charm: ../../../neutron-openvswitch
|
||||||
|
options:
|
||||||
|
use-dvr-snat: True
|
||||||
|
bridge-mappings: physnet1:br-ex
|
||||||
|
enable-local-dhcp-and-metadata: True
|
||||||
|
nova-cloud-controller:
|
||||||
|
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
network-manager: Neutron
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '5'
|
||||||
|
nova-compute:
|
||||||
|
charm: cs:~openstack-charmers-next/nova-compute
|
||||||
|
num_units: 2
|
||||||
|
options:
|
||||||
|
config-flags: default_ephemeral_format=ext4
|
||||||
|
enable-live-migration: true
|
||||||
|
enable-resize: true
|
||||||
|
migration-auth-type: ssh
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '6'
|
||||||
|
- '7'
|
||||||
|
relations:
|
||||||
|
- - 'neutron-api:shared-db'
|
||||||
|
- 'percona-cluster:shared-db'
|
||||||
|
- - 'neutron-api:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'neutron-api:neutron-api'
|
||||||
|
- 'nova-cloud-controller:neutron-api'
|
||||||
|
- - 'neutron-api:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
- - 'keystone:shared-db'
|
||||||
|
- 'percona-cluster:shared-db'
|
||||||
|
- - 'nova-compute:neutron-plugin'
|
||||||
|
- 'neutron-openvswitch:neutron-plugin'
|
||||||
|
- - 'neutron-api:neutron-plugin-api'
|
||||||
|
- 'neutron-openvswitch:neutron-plugin-api'
|
||||||
|
- - 'nova-cloud-controller:shared-db'
|
||||||
|
- 'percona-cluster:shared-db'
|
||||||
|
- - 'nova-cloud-controller:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'nova-compute:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'neutron-openvswitch:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'nova-cloud-controller:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
- - 'nova-cloud-controller:cloud-compute'
|
||||||
|
- 'nova-compute:cloud-compute'
|
||||||
|
- - 'glance:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
- - 'glance:shared-db'
|
||||||
|
- 'percona-cluster:shared-db'
|
||||||
|
- - 'glance:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'nova-compute:image-service'
|
||||||
|
- 'glance:image-service'
|
||||||
|
- - 'nova-cloud-controller:image-service'
|
||||||
|
- 'glance:image-service'
|
@ -1,98 +0,0 @@
|
|||||||
series: bionic
|
|
||||||
|
|
||||||
machines:
|
|
||||||
'0':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'1':
|
|
||||||
'2':
|
|
||||||
'3':
|
|
||||||
'4':
|
|
||||||
'5':
|
|
||||||
'6':
|
|
||||||
|
|
||||||
applications:
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers-next/nova-compute
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:bionic-stein
|
|
||||||
to:
|
|
||||||
- '1'
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
network-manager: Neutron
|
|
||||||
openstack-origin: cloud:bionic-stein
|
|
||||||
to:
|
|
||||||
- '2'
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
keystone:
|
|
||||||
num_units: 1
|
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:bionic-stein
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers-next/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:bionic-stein
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers-next/neutron-api
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:bionic-stein
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
percona-cluster:
|
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: ../../../neutron-openvswitch
|
|
||||||
|
|
||||||
relations:
|
|
||||||
- - 'neutron-openvswitch:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'neutron-openvswitch:neutron-plugin'
|
|
||||||
- 'nova-compute:neutron-plugin'
|
|
||||||
- - 'neutron-openvswitch:neutron-plugin-api'
|
|
||||||
- 'neutron-api:neutron-plugin-api'
|
|
||||||
- - 'neutron-api:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
- - 'neutron-api:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'neutron-api:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-compute:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-compute:image-service'
|
|
||||||
- 'glance:image-service'
|
|
||||||
- - 'glance:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
- - 'glance:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'glance:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'nova-cloud-controller:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'nova-cloud-controller:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-cloud-controller:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
- - 'nova-cloud-controller:cloud-compute'
|
|
||||||
- 'nova-compute:cloud-compute'
|
|
||||||
- - 'nova-cloud-controller:image-service'
|
|
||||||
- 'glance:image-service'
|
|
139
tests/bundles/bionic-train-dvr-snat.yaml
Normal file
139
tests/bundles/bionic-train-dvr-snat.yaml
Normal file
@ -0,0 +1,139 @@
|
|||||||
|
variables:
|
||||||
|
openstack-origin: &openstack-origin cloud:bionic-train
|
||||||
|
|
||||||
|
series: &series bionic
|
||||||
|
|
||||||
|
machines:
|
||||||
|
0:
|
||||||
|
constraints: "mem=3072M"
|
||||||
|
1: {}
|
||||||
|
2: {}
|
||||||
|
3: {}
|
||||||
|
4: {}
|
||||||
|
5: {}
|
||||||
|
6:
|
||||||
|
constraints: "root-disk=20G mem=4G"
|
||||||
|
7:
|
||||||
|
constraints: "root-disk=20G mem=4G"
|
||||||
|
8: {}
|
||||||
|
|
||||||
|
# We specify machine placements for these to improve iteration
|
||||||
|
# time, given that machine "0" comes up way before machine "7"
|
||||||
|
applications:
|
||||||
|
percona-cluster:
|
||||||
|
charm: cs:~openstack-charmers-next/percona-cluster
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '0'
|
||||||
|
rabbitmq-server:
|
||||||
|
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '1'
|
||||||
|
neutron-api:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-api
|
||||||
|
series: *series
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
overlay-network-type: 'vxlan'
|
||||||
|
l2-population: True
|
||||||
|
flat-network-providers: physnet1
|
||||||
|
neutron-security-groups: true
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
enable-dvr: True
|
||||||
|
to:
|
||||||
|
- '2'
|
||||||
|
keystone:
|
||||||
|
charm: cs:~openstack-charmers-next/keystone
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '3'
|
||||||
|
glance:
|
||||||
|
charm: cs:~openstack-charmers-next/glance
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '4'
|
||||||
|
neutron-openvswitch:
|
||||||
|
charm: ../../../neutron-openvswitch
|
||||||
|
options:
|
||||||
|
use-dvr-snat: True
|
||||||
|
bridge-mappings: physnet1:br-ex
|
||||||
|
enable-local-dhcp-and-metadata: True
|
||||||
|
nova-cloud-controller:
|
||||||
|
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
network-manager: Neutron
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '5'
|
||||||
|
nova-compute:
|
||||||
|
charm: cs:~openstack-charmers-next/nova-compute
|
||||||
|
num_units: 2
|
||||||
|
options:
|
||||||
|
config-flags: default_ephemeral_format=ext4
|
||||||
|
enable-live-migration: true
|
||||||
|
enable-resize: true
|
||||||
|
migration-auth-type: ssh
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '6'
|
||||||
|
- '7'
|
||||||
|
placement:
|
||||||
|
charm: cs:~openstack-charmers-next/placement
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '8'
|
||||||
|
relations:
|
||||||
|
- - 'neutron-api:shared-db'
|
||||||
|
- 'percona-cluster:shared-db'
|
||||||
|
- - 'neutron-api:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'neutron-api:neutron-api'
|
||||||
|
- 'nova-cloud-controller:neutron-api'
|
||||||
|
- - 'neutron-api:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
- - 'keystone:shared-db'
|
||||||
|
- 'percona-cluster:shared-db'
|
||||||
|
- - 'nova-compute:neutron-plugin'
|
||||||
|
- 'neutron-openvswitch:neutron-plugin'
|
||||||
|
- - 'neutron-api:neutron-plugin-api'
|
||||||
|
- 'neutron-openvswitch:neutron-plugin-api'
|
||||||
|
- - 'nova-cloud-controller:shared-db'
|
||||||
|
- 'percona-cluster:shared-db'
|
||||||
|
- - 'nova-cloud-controller:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'nova-compute:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'neutron-openvswitch:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'nova-cloud-controller:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
- - 'nova-cloud-controller:cloud-compute'
|
||||||
|
- 'nova-compute:cloud-compute'
|
||||||
|
- - 'glance:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
- - 'glance:shared-db'
|
||||||
|
- 'percona-cluster:shared-db'
|
||||||
|
- - 'glance:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'nova-compute:image-service'
|
||||||
|
- 'glance:image-service'
|
||||||
|
- - 'nova-cloud-controller:image-service'
|
||||||
|
- 'glance:image-service'
|
||||||
|
- - 'placement:shared-db'
|
||||||
|
- 'percona-cluster:shared-db'
|
||||||
|
- - 'placement:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
- - 'placement:placement'
|
||||||
|
- 'nova-cloud-controller:placement'
|
@ -1,114 +0,0 @@
|
|||||||
series: bionic
|
|
||||||
|
|
||||||
machines:
|
|
||||||
'0':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'1':
|
|
||||||
'2':
|
|
||||||
'3':
|
|
||||||
'4':
|
|
||||||
'5':
|
|
||||||
'6':
|
|
||||||
'7':
|
|
||||||
|
|
||||||
applications:
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers-next/nova-compute
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:bionic-train
|
|
||||||
to:
|
|
||||||
- '1'
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
network-manager: Neutron
|
|
||||||
openstack-origin: cloud:bionic-train
|
|
||||||
to:
|
|
||||||
- '2'
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
keystone:
|
|
||||||
num_units: 1
|
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:bionic-train
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers-next/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:bionic-train
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers-next/neutron-api
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:bionic-train
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
percona-cluster:
|
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
placement:
|
|
||||||
charm: cs:~openstack-charmers-next/bionic/placement
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:bionic-train
|
|
||||||
to:
|
|
||||||
- '7'
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: ../../../neutron-openvswitch
|
|
||||||
|
|
||||||
relations:
|
|
||||||
- - 'neutron-openvswitch:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'neutron-openvswitch:neutron-plugin'
|
|
||||||
- 'nova-compute:neutron-plugin'
|
|
||||||
- - 'neutron-openvswitch:neutron-plugin-api'
|
|
||||||
- 'neutron-api:neutron-plugin-api'
|
|
||||||
- - 'neutron-api:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
- - 'neutron-api:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'neutron-api:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-compute:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-compute:image-service'
|
|
||||||
- 'glance:image-service'
|
|
||||||
- - 'glance:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
- - 'glance:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'glance:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'nova-cloud-controller:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'nova-cloud-controller:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-cloud-controller:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
- - 'nova-cloud-controller:cloud-compute'
|
|
||||||
- 'nova-compute:cloud-compute'
|
|
||||||
- - 'nova-cloud-controller:image-service'
|
|
||||||
- 'glance:image-service'
|
|
||||||
- - 'placement:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'placement:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'placement:placement'
|
|
||||||
- 'nova-cloud-controller:placement'
|
|
||||||
- - 'placement:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
140
tests/bundles/bionic-ussuri-dvr-snat.yaml
Normal file
140
tests/bundles/bionic-ussuri-dvr-snat.yaml
Normal file
@ -0,0 +1,140 @@
|
|||||||
|
variables:
|
||||||
|
openstack-origin: &openstack-origin cloud:bionic-ussuri
|
||||||
|
|
||||||
|
series: &series bionic
|
||||||
|
|
||||||
|
machines:
|
||||||
|
0:
|
||||||
|
constraints: "mem=3072M"
|
||||||
|
1: {}
|
||||||
|
2: {}
|
||||||
|
3: {}
|
||||||
|
4: {}
|
||||||
|
5: {}
|
||||||
|
6:
|
||||||
|
constraints: "root-disk=20G mem=4G"
|
||||||
|
7:
|
||||||
|
constraints: "root-disk=20G mem=4G"
|
||||||
|
8: {}
|
||||||
|
|
||||||
|
# We specify machine placements for these to improve iteration
|
||||||
|
# time, given that machine "0" comes up way before machine "7"
|
||||||
|
applications:
|
||||||
|
percona-cluster:
|
||||||
|
charm: cs:~openstack-charmers-next/percona-cluster
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '0'
|
||||||
|
rabbitmq-server:
|
||||||
|
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '1'
|
||||||
|
neutron-api:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-api
|
||||||
|
series: *series
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
manage-neutron-plugin-legacy-mode: true
|
||||||
|
overlay-network-type: 'vxlan'
|
||||||
|
l2-population: True
|
||||||
|
flat-network-providers: physnet1
|
||||||
|
neutron-security-groups: true
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
enable-dvr: True
|
||||||
|
to:
|
||||||
|
- '2'
|
||||||
|
keystone:
|
||||||
|
charm: cs:~openstack-charmers-next/keystone
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '3'
|
||||||
|
glance:
|
||||||
|
charm: cs:~openstack-charmers-next/glance
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '4'
|
||||||
|
neutron-openvswitch:
|
||||||
|
charm: ../../../neutron-openvswitch
|
||||||
|
options:
|
||||||
|
use-dvr-snat: True
|
||||||
|
bridge-mappings: physnet1:br-ex
|
||||||
|
enable-local-dhcp-and-metadata: True
|
||||||
|
nova-cloud-controller:
|
||||||
|
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
network-manager: Neutron
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '5'
|
||||||
|
nova-compute:
|
||||||
|
charm: cs:~openstack-charmers-next/nova-compute
|
||||||
|
num_units: 2
|
||||||
|
options:
|
||||||
|
config-flags: default_ephemeral_format=ext4
|
||||||
|
enable-live-migration: true
|
||||||
|
enable-resize: true
|
||||||
|
migration-auth-type: ssh
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '6'
|
||||||
|
- '7'
|
||||||
|
placement:
|
||||||
|
charm: cs:~openstack-charmers-next/placement
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '8'
|
||||||
|
relations:
|
||||||
|
- - 'neutron-api:shared-db'
|
||||||
|
- 'percona-cluster:shared-db'
|
||||||
|
- - 'neutron-api:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'neutron-api:neutron-api'
|
||||||
|
- 'nova-cloud-controller:neutron-api'
|
||||||
|
- - 'neutron-api:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
- - 'keystone:shared-db'
|
||||||
|
- 'percona-cluster:shared-db'
|
||||||
|
- - 'nova-compute:neutron-plugin'
|
||||||
|
- 'neutron-openvswitch:neutron-plugin'
|
||||||
|
- - 'neutron-api:neutron-plugin-api'
|
||||||
|
- 'neutron-openvswitch:neutron-plugin-api'
|
||||||
|
- - 'nova-cloud-controller:shared-db'
|
||||||
|
- 'percona-cluster:shared-db'
|
||||||
|
- - 'nova-cloud-controller:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'nova-compute:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'neutron-openvswitch:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'nova-cloud-controller:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
- - 'nova-cloud-controller:cloud-compute'
|
||||||
|
- 'nova-compute:cloud-compute'
|
||||||
|
- - 'glance:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
- - 'glance:shared-db'
|
||||||
|
- 'percona-cluster:shared-db'
|
||||||
|
- - 'glance:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'nova-compute:image-service'
|
||||||
|
- 'glance:image-service'
|
||||||
|
- - 'nova-cloud-controller:image-service'
|
||||||
|
- 'glance:image-service'
|
||||||
|
- - 'placement:shared-db'
|
||||||
|
- 'percona-cluster:shared-db'
|
||||||
|
- - 'placement:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
- - 'placement:placement'
|
||||||
|
- 'nova-cloud-controller:placement'
|
@ -1,115 +0,0 @@
|
|||||||
series: bionic
|
|
||||||
|
|
||||||
machines:
|
|
||||||
'0':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'1':
|
|
||||||
'2':
|
|
||||||
'3':
|
|
||||||
'4':
|
|
||||||
'5':
|
|
||||||
'6':
|
|
||||||
'7':
|
|
||||||
|
|
||||||
applications:
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers-next/nova-compute
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:bionic-ussuri
|
|
||||||
to:
|
|
||||||
- '1'
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
network-manager: Neutron
|
|
||||||
openstack-origin: cloud:bionic-ussuri
|
|
||||||
to:
|
|
||||||
- '2'
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
keystone:
|
|
||||||
num_units: 1
|
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:bionic-ussuri
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers-next/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:bionic-ussuri
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers-next/neutron-api
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
manage-neutron-plugin-legacy-mode: true
|
|
||||||
openstack-origin: cloud:bionic-ussuri
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
percona-cluster:
|
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
placement:
|
|
||||||
charm: cs:~openstack-charmers-next/bionic/placement
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:bionic-ussuri
|
|
||||||
to:
|
|
||||||
- '7'
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: ../../../neutron-openvswitch
|
|
||||||
|
|
||||||
relations:
|
|
||||||
- - 'neutron-openvswitch:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'neutron-openvswitch:neutron-plugin'
|
|
||||||
- 'nova-compute:neutron-plugin'
|
|
||||||
- - 'neutron-openvswitch:neutron-plugin-api'
|
|
||||||
- 'neutron-api:neutron-plugin-api'
|
|
||||||
- - 'neutron-api:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
- - 'neutron-api:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'neutron-api:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-compute:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-compute:image-service'
|
|
||||||
- 'glance:image-service'
|
|
||||||
- - 'glance:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
- - 'glance:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'glance:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'nova-cloud-controller:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'nova-cloud-controller:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-cloud-controller:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
- - 'nova-cloud-controller:cloud-compute'
|
|
||||||
- 'nova-compute:cloud-compute'
|
|
||||||
- - 'nova-cloud-controller:image-service'
|
|
||||||
- 'glance:image-service'
|
|
||||||
- - 'placement:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'placement:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'placement:placement'
|
|
||||||
- 'nova-cloud-controller:placement'
|
|
||||||
- - 'placement:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
@ -1,38 +1,41 @@
|
|||||||
variables:
|
variables:
|
||||||
openstack-origin: &openstack-origin distro
|
openstack-origin: &openstack-origin distro
|
||||||
|
|
||||||
series: focal
|
series: &series focal
|
||||||
|
|
||||||
comment:
|
|
||||||
- 'machines section to decide order of deployment. database sooner = faster'
|
|
||||||
machines:
|
machines:
|
||||||
'0':
|
0:
|
||||||
constraints: mem=3072M
|
constraints: "mem=3072M"
|
||||||
'1':
|
1:
|
||||||
constraints: mem=3072M
|
constraints: "mem=3072M"
|
||||||
'2':
|
2:
|
||||||
constraints: mem=3072M
|
constraints: "mem=3072M"
|
||||||
'3':
|
3: {}
|
||||||
'4':
|
4: {}
|
||||||
'5':
|
5: {}
|
||||||
'6':
|
6: {}
|
||||||
'7':
|
7: {}
|
||||||
'8':
|
8:
|
||||||
'9':
|
constraints: "root-disk=20G mem=4G"
|
||||||
|
9:
|
||||||
|
constraints: "root-disk=20G mem=4G"
|
||||||
|
10: {}
|
||||||
|
|
||||||
|
# We specify machine placements for these to improve iteration
|
||||||
|
# time, given that machine "0" comes up way before machine "7"
|
||||||
applications:
|
applications:
|
||||||
|
keystone-mysql-router:
|
||||||
neutron-api-mysql-router:
|
charm: cs:~openstack-charmers-next/mysql-router
|
||||||
|
nova-mysql-router:
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
charm: cs:~openstack-charmers-next/mysql-router
|
||||||
glance-mysql-router:
|
glance-mysql-router:
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
charm: cs:~openstack-charmers-next/mysql-router
|
||||||
keystone-mysql-router:
|
neutron-mysql-router:
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
|
||||||
nova-cloud-controller-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
charm: cs:~openstack-charmers-next/mysql-router
|
||||||
placement-mysql-router:
|
placement-mysql-router:
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
charm: cs:~openstack-charmers-next/mysql-router
|
||||||
|
vault-mysql-router:
|
||||||
|
charm: cs:~openstack-charmers-next/mysql-router
|
||||||
mysql-innodb-cluster:
|
mysql-innodb-cluster:
|
||||||
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
|
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
|
||||||
num_units: 3
|
num_units: 3
|
||||||
@ -42,15 +45,47 @@ applications:
|
|||||||
- '0'
|
- '0'
|
||||||
- '1'
|
- '1'
|
||||||
- '2'
|
- '2'
|
||||||
|
rabbitmq-server:
|
||||||
nova-compute:
|
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||||
charm: cs:~openstack-charmers-next/nova-compute
|
num_units: 1
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '3'
|
||||||
|
neutron-api:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-api
|
||||||
|
series: *series
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
manage-neutron-plugin-legacy-mode: true
|
||||||
|
overlay-network-type: 'vxlan'
|
||||||
|
l2-population: True
|
||||||
|
flat-network-providers: physnet1
|
||||||
|
neutron-security-groups: true
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
enable-dvr: True
|
||||||
|
to:
|
||||||
|
- '4'
|
||||||
|
keystone:
|
||||||
|
charm: cs:~openstack-charmers-next/keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '3'
|
- '5'
|
||||||
|
glance:
|
||||||
|
charm: cs:~openstack-charmers-next/glance
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '6'
|
||||||
|
neutron-openvswitch:
|
||||||
|
charm: ../../../neutron-openvswitch
|
||||||
|
options:
|
||||||
|
use-dvr-snat: True
|
||||||
|
bridge-mappings: physnet1:br-ex
|
||||||
|
enable-local-dhcp-and-metadata: True
|
||||||
nova-cloud-controller:
|
nova-cloud-controller:
|
||||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||||
num_units: 1
|
num_units: 1
|
||||||
@ -58,123 +93,66 @@ applications:
|
|||||||
network-manager: Neutron
|
network-manager: Neutron
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '4'
|
- '7'
|
||||||
|
nova-compute:
|
||||||
rabbitmq-server:
|
charm: cs:~openstack-charmers-next/nova-compute
|
||||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
num_units: 2
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
num_units: 1
|
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
options:
|
||||||
|
config-flags: default_ephemeral_format=ext4
|
||||||
|
enable-live-migration: true
|
||||||
|
enable-resize: true
|
||||||
|
migration-auth-type: ssh
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '6'
|
- '8'
|
||||||
|
- '9'
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers-next/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '7'
|
|
||||||
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers-next/neutron-api
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
manage-neutron-plugin-legacy-mode: true
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '8'
|
|
||||||
|
|
||||||
placement:
|
placement:
|
||||||
charm: cs:~openstack-charmers-next/bionic/placement
|
charm: cs:~openstack-charmers-next/placement
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '9'
|
- '10'
|
||||||
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: ../../../neutron-openvswitch
|
|
||||||
|
|
||||||
relations:
|
relations:
|
||||||
- - 'neutron-openvswitch:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'neutron-openvswitch:neutron-plugin'
|
|
||||||
- 'nova-compute:neutron-plugin'
|
|
||||||
|
|
||||||
- - 'neutron-openvswitch:neutron-plugin-api'
|
|
||||||
- 'neutron-api:neutron-plugin-api'
|
|
||||||
|
|
||||||
- - 'neutron-api:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'neutron-api:shared-db'
|
|
||||||
- 'neutron-api-mysql-router:shared-db'
|
|
||||||
- - 'neutron-api-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'neutron-api:amqp'
|
- - 'neutron-api:amqp'
|
||||||
- 'rabbitmq-server:amqp'
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'neutron-api:neutron-api'
|
||||||
- - 'nova-compute:amqp'
|
- 'nova-cloud-controller:neutron-api'
|
||||||
- 'rabbitmq-server:amqp'
|
- - 'neutron-api:identity-service'
|
||||||
|
|
||||||
- - 'nova-compute:image-service'
|
|
||||||
- 'glance:image-service'
|
|
||||||
|
|
||||||
- - 'glance:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
- 'keystone:identity-service'
|
||||||
|
- - 'nova-compute:neutron-plugin'
|
||||||
- - 'glance:shared-db'
|
- 'neutron-openvswitch:neutron-plugin'
|
||||||
- 'glance-mysql-router:shared-db'
|
- - 'neutron-api:neutron-plugin-api'
|
||||||
- - 'glance-mysql-router:db-router'
|
- 'neutron-openvswitch:neutron-plugin-api'
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'glance:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'keystone-mysql-router:shared-db'
|
|
||||||
- - 'keystone-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'nova-cloud-controller:shared-db'
|
|
||||||
- 'nova-cloud-controller-mysql-router:shared-db'
|
|
||||||
- - 'nova-cloud-controller-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'nova-cloud-controller:amqp'
|
- - 'nova-cloud-controller:amqp'
|
||||||
- 'rabbitmq-server:amqp'
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'nova-compute:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'neutron-openvswitch:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
- - 'nova-cloud-controller:identity-service'
|
- - 'nova-cloud-controller:identity-service'
|
||||||
- 'keystone:identity-service'
|
- 'keystone:identity-service'
|
||||||
|
|
||||||
- - 'nova-cloud-controller:cloud-compute'
|
- - 'nova-cloud-controller:cloud-compute'
|
||||||
- 'nova-compute:cloud-compute'
|
- 'nova-compute:cloud-compute'
|
||||||
|
- - 'glance:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
- - 'glance:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'nova-compute:image-service'
|
||||||
|
- 'glance:image-service'
|
||||||
- - 'nova-cloud-controller:image-service'
|
- - 'nova-cloud-controller:image-service'
|
||||||
- 'glance:image-service'
|
- 'glance:image-service'
|
||||||
|
|
||||||
- - 'placement:shared-db'
|
|
||||||
- 'placement-mysql-router:shared-db'
|
|
||||||
- - 'placement-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'placement:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'placement:placement'
|
|
||||||
- 'nova-cloud-controller:placement'
|
|
||||||
|
|
||||||
- - 'placement:identity-service'
|
- - 'placement:identity-service'
|
||||||
- 'keystone:identity-service'
|
- 'keystone:identity-service'
|
||||||
|
- - 'placement:placement'
|
||||||
|
- 'nova-cloud-controller:placement'
|
||||||
|
- ["keystone:shared-db", "keystone-mysql-router:shared-db"]
|
||||||
|
- ["glance:shared-db", "glance-mysql-router:shared-db"]
|
||||||
|
- ["nova-cloud-controller:shared-db", "nova-mysql-router:shared-db"]
|
||||||
|
- ["neutron-api:shared-db", "neutron-mysql-router:shared-db"]
|
||||||
|
- ["placement:shared-db", "placement-mysql-router:shared-db"]
|
||||||
|
- ["keystone-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||||
|
- ["nova-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||||
|
- ["glance-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||||
|
- ["neutron-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||||
|
- ["placement-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
@ -1,98 +1,131 @@
|
|||||||
series: trusty
|
variables:
|
||||||
|
openstack-origin: &openstack-origin cloud:trusty-mitaka
|
||||||
|
|
||||||
|
series: &series trusty
|
||||||
|
|
||||||
machines:
|
machines:
|
||||||
'0':
|
0:
|
||||||
constraints: mem=3072M
|
constraints: "mem=3072M"
|
||||||
'1':
|
1: {}
|
||||||
'2':
|
2: {}
|
||||||
'3':
|
3: {}
|
||||||
'4':
|
4: {}
|
||||||
'5':
|
5: {}
|
||||||
'6':
|
6: {}
|
||||||
|
7:
|
||||||
|
constraints: "root-disk=20G mem=4G"
|
||||||
|
8:
|
||||||
|
constraints: "root-disk=20G mem=4G"
|
||||||
|
|
||||||
|
# We specify machine placements for these to improve iteration
|
||||||
|
# time, given that machine "0" comes up way before machine "7"
|
||||||
applications:
|
applications:
|
||||||
nova-compute:
|
percona-cluster:
|
||||||
charm: cs:~openstack-charmers-next/nova-compute
|
charm: cs:trusty/percona-cluster
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: cloud:trusty-mitaka
|
source: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '1'
|
- '0'
|
||||||
|
rabbitmq-server:
|
||||||
|
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '1'
|
||||||
|
neutron-api:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-api
|
||||||
|
series: *series
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
flat-network-providers: physnet1
|
||||||
|
neutron-security-groups: true
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '2'
|
||||||
|
keystone:
|
||||||
|
charm: cs:~openstack-charmers-next/keystone
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '3'
|
||||||
|
glance:
|
||||||
|
charm: cs:~openstack-charmers-next/glance
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '4'
|
||||||
|
neutron-openvswitch:
|
||||||
|
charm: ../../../neutron-openvswitch
|
||||||
|
neutron-gateway:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-gateway
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
bridge-mappings: physnet1:br-ex
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '5'
|
||||||
nova-cloud-controller:
|
nova-cloud-controller:
|
||||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
network-manager: Neutron
|
network-manager: Neutron
|
||||||
openstack-origin: cloud:trusty-mitaka
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '2'
|
- '6'
|
||||||
rabbitmq-server:
|
nova-compute:
|
||||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
charm: cs:~openstack-charmers-next/nova-compute
|
||||||
num_units: 1
|
num_units: 2
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
keystone:
|
|
||||||
num_units: 1
|
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
options:
|
||||||
openstack-origin: cloud:trusty-mitaka
|
config-flags: default_ephemeral_format=ext4
|
||||||
|
enable-live-migration: true
|
||||||
|
enable-resize: true
|
||||||
|
migration-auth-type: ssh
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '4'
|
- '7'
|
||||||
glance:
|
- '8'
|
||||||
charm: cs:~openstack-charmers-next/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:trusty-mitaka
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers-next/neutron-api
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:trusty-mitaka
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
percona-cluster:
|
|
||||||
charm: cs:trusty/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: ../../../neutron-openvswitch
|
|
||||||
|
|
||||||
relations:
|
relations:
|
||||||
- - 'neutron-openvswitch:amqp'
|
- - 'neutron-api:shared-db'
|
||||||
- 'rabbitmq-server:amqp'
|
- 'percona-cluster:shared-db'
|
||||||
- - 'neutron-openvswitch:neutron-plugin'
|
- - 'neutron-api:amqp'
|
||||||
- 'nova-compute:neutron-plugin'
|
- 'rabbitmq-server:amqp'
|
||||||
- - 'neutron-openvswitch:neutron-plugin-api'
|
- - 'neutron-api:neutron-api'
|
||||||
- 'neutron-api:neutron-plugin-api'
|
- 'nova-cloud-controller:neutron-api'
|
||||||
- - 'neutron-api:identity-service'
|
- - 'neutron-api:neutron-plugin-api'
|
||||||
- 'keystone:identity-service'
|
- 'neutron-gateway:neutron-plugin-api'
|
||||||
- - 'neutron-api:shared-db'
|
- - 'neutron-api:identity-service'
|
||||||
- 'percona-cluster:shared-db'
|
- 'keystone:identity-service'
|
||||||
- - 'neutron-api:amqp'
|
- - 'keystone:shared-db'
|
||||||
- 'rabbitmq-server:amqp'
|
- 'percona-cluster:shared-db'
|
||||||
- - 'nova-compute:amqp'
|
- - 'nova-compute:neutron-plugin'
|
||||||
- 'rabbitmq-server:amqp'
|
- 'neutron-openvswitch:neutron-plugin'
|
||||||
- - 'nova-compute:image-service'
|
- - 'nova-cloud-controller:shared-db'
|
||||||
- 'glance:image-service'
|
- 'percona-cluster:shared-db'
|
||||||
- - 'glance:identity-service'
|
- - 'neutron-gateway:amqp'
|
||||||
- 'keystone:identity-service'
|
- 'rabbitmq-server:amqp'
|
||||||
- - 'glance:shared-db'
|
- - 'nova-cloud-controller:amqp'
|
||||||
- 'percona-cluster:shared-db'
|
- 'rabbitmq-server:amqp'
|
||||||
- - 'glance:amqp'
|
- - 'nova-compute:amqp'
|
||||||
- 'rabbitmq-server:amqp'
|
- 'rabbitmq-server:amqp'
|
||||||
- - 'keystone:shared-db'
|
- - 'neutron-openvswitch:amqp'
|
||||||
- 'percona-cluster:shared-db'
|
- 'rabbitmq-server:amqp'
|
||||||
- - 'nova-cloud-controller:shared-db'
|
- - 'nova-cloud-controller:identity-service'
|
||||||
- 'percona-cluster:shared-db'
|
- 'keystone:identity-service'
|
||||||
- - 'nova-cloud-controller:amqp'
|
- - 'nova-cloud-controller:cloud-compute'
|
||||||
- 'rabbitmq-server:amqp'
|
- 'nova-compute:cloud-compute'
|
||||||
- - 'nova-cloud-controller:identity-service'
|
- - 'glance:identity-service'
|
||||||
- 'keystone:identity-service'
|
- 'keystone:identity-service'
|
||||||
- - 'nova-cloud-controller:cloud-compute'
|
- - 'glance:shared-db'
|
||||||
- 'nova-compute:cloud-compute'
|
- 'percona-cluster:shared-db'
|
||||||
- - 'nova-cloud-controller:image-service'
|
- - 'glance:amqp'
|
||||||
- 'glance:image-service'
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'nova-compute:image-service'
|
||||||
|
- 'glance:image-service'
|
||||||
|
- - 'nova-cloud-controller:image-service'
|
||||||
|
- 'glance:image-service'
|
||||||
|
- - 'nova-cloud-controller:quantum-network-service'
|
||||||
|
- 'neutron-gateway:quantum-network-service'
|
||||||
|
@ -1,89 +1,133 @@
|
|||||||
series: xenial
|
variables:
|
||||||
|
openstack-origin: &openstack-origin distro
|
||||||
|
|
||||||
|
series: &series xenial
|
||||||
|
|
||||||
machines:
|
machines:
|
||||||
'0':
|
0:
|
||||||
constraints: mem=3072M
|
constraints: "mem=3072M"
|
||||||
'1':
|
1: {}
|
||||||
'2':
|
2: {}
|
||||||
'3':
|
3: {}
|
||||||
'4':
|
4: {}
|
||||||
'5':
|
5: {}
|
||||||
'6':
|
6: {}
|
||||||
|
7:
|
||||||
|
constraints: "root-disk=20G mem=4G"
|
||||||
|
8:
|
||||||
|
constraints: "root-disk=20G mem=4G"
|
||||||
|
|
||||||
|
# We specify machine placements for these to improve iteration
|
||||||
|
# time, given that machine "0" comes up way before machine "7"
|
||||||
applications:
|
applications:
|
||||||
nova-compute:
|
percona-cluster:
|
||||||
charm: cs:~openstack-charmers-next/nova-compute
|
charm: cs:~openstack-charmers-next/percona-cluster
|
||||||
num_units: 1
|
num_units: 1
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '1'
|
- '0'
|
||||||
|
rabbitmq-server:
|
||||||
|
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '1'
|
||||||
|
neutron-api:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-api
|
||||||
|
series: *series
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
flat-network-providers: physnet1
|
||||||
|
neutron-security-groups: true
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '2'
|
||||||
|
keystone:
|
||||||
|
charm: cs:~openstack-charmers-next/keystone
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '3'
|
||||||
|
glance:
|
||||||
|
charm: cs:~openstack-charmers-next/glance
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '4'
|
||||||
|
neutron-openvswitch:
|
||||||
|
charm: ../../../neutron-openvswitch
|
||||||
|
neutron-gateway:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-gateway
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
bridge-mappings: physnet1:br-ex
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '5'
|
||||||
nova-cloud-controller:
|
nova-cloud-controller:
|
||||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
network-manager: Neutron
|
network-manager: Neutron
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '2'
|
- '6'
|
||||||
rabbitmq-server:
|
nova-compute:
|
||||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
charm: cs:~openstack-charmers-next/nova-compute
|
||||||
num_units: 1
|
num_units: 2
|
||||||
|
options:
|
||||||
|
config-flags: default_ephemeral_format=ext4
|
||||||
|
enable-live-migration: true
|
||||||
|
enable-resize: true
|
||||||
|
migration-auth-type: ssh
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '3'
|
- '7'
|
||||||
keystone:
|
- '8'
|
||||||
num_units: 1
|
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers-next/glance
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers-next/neutron-api
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
percona-cluster:
|
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: ../../../neutron-openvswitch
|
|
||||||
|
|
||||||
relations:
|
relations:
|
||||||
- - 'neutron-openvswitch:amqp'
|
- - 'neutron-api:shared-db'
|
||||||
- 'rabbitmq-server:amqp'
|
- 'percona-cluster:shared-db'
|
||||||
- - 'neutron-openvswitch:neutron-plugin'
|
- - 'neutron-api:amqp'
|
||||||
- 'nova-compute:neutron-plugin'
|
- 'rabbitmq-server:amqp'
|
||||||
- - 'neutron-openvswitch:neutron-plugin-api'
|
- - 'neutron-api:neutron-api'
|
||||||
- 'neutron-api:neutron-plugin-api'
|
- 'nova-cloud-controller:neutron-api'
|
||||||
- - 'neutron-api:identity-service'
|
- - 'neutron-api:neutron-plugin-api'
|
||||||
- 'keystone:identity-service'
|
- 'neutron-gateway:neutron-plugin-api'
|
||||||
- - 'neutron-api:shared-db'
|
- - 'neutron-api:identity-service'
|
||||||
- 'percona-cluster:shared-db'
|
- 'keystone:identity-service'
|
||||||
- - 'neutron-api:amqp'
|
- - 'keystone:shared-db'
|
||||||
- 'rabbitmq-server:amqp'
|
- 'percona-cluster:shared-db'
|
||||||
- - 'nova-compute:amqp'
|
- - 'nova-compute:neutron-plugin'
|
||||||
- 'rabbitmq-server:amqp'
|
- 'neutron-openvswitch:neutron-plugin'
|
||||||
- - 'nova-compute:image-service'
|
- - 'neutron-api:neutron-plugin-api'
|
||||||
- 'glance:image-service'
|
- 'neutron-openvswitch:neutron-plugin-api'
|
||||||
- - 'glance:identity-service'
|
- - 'nova-cloud-controller:shared-db'
|
||||||
- 'keystone:identity-service'
|
- 'percona-cluster:shared-db'
|
||||||
- - 'glance:shared-db'
|
- - 'neutron-gateway:amqp'
|
||||||
- 'percona-cluster:shared-db'
|
- 'rabbitmq-server:amqp'
|
||||||
- - 'glance:amqp'
|
- - 'nova-cloud-controller:amqp'
|
||||||
- 'rabbitmq-server:amqp'
|
- 'rabbitmq-server:amqp'
|
||||||
- - 'keystone:shared-db'
|
- - 'nova-compute:amqp'
|
||||||
- 'percona-cluster:shared-db'
|
- 'rabbitmq-server:amqp'
|
||||||
- - 'nova-cloud-controller:shared-db'
|
- - 'neutron-openvswitch:amqp'
|
||||||
- 'percona-cluster:shared-db'
|
- 'rabbitmq-server:amqp'
|
||||||
- - 'nova-cloud-controller:amqp'
|
- - 'nova-cloud-controller:identity-service'
|
||||||
- 'rabbitmq-server:amqp'
|
- 'keystone:identity-service'
|
||||||
- - 'nova-cloud-controller:identity-service'
|
- - 'nova-cloud-controller:cloud-compute'
|
||||||
- 'keystone:identity-service'
|
- 'nova-compute:cloud-compute'
|
||||||
- - 'nova-cloud-controller:cloud-compute'
|
- - 'glance:identity-service'
|
||||||
- 'nova-compute:cloud-compute'
|
- 'keystone:identity-service'
|
||||||
- - 'nova-cloud-controller:image-service'
|
- - 'glance:shared-db'
|
||||||
- 'glance:image-service'
|
- 'percona-cluster:shared-db'
|
||||||
|
- - 'glance:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'nova-compute:image-service'
|
||||||
|
- 'glance:image-service'
|
||||||
|
- - 'nova-cloud-controller:image-service'
|
||||||
|
- 'glance:image-service'
|
||||||
|
- - 'nova-cloud-controller:quantum-network-service'
|
||||||
|
- 'neutron-gateway:quantum-network-service'
|
||||||
|
@ -1,98 +1,133 @@
|
|||||||
series: xenial
|
variables:
|
||||||
|
openstack-origin: &openstack-origin cloud:xenial-ocata
|
||||||
|
|
||||||
|
series: &series xenial
|
||||||
|
|
||||||
machines:
|
machines:
|
||||||
'0':
|
0:
|
||||||
constraints: mem=3072M
|
constraints: "mem=3072M"
|
||||||
'1':
|
1: {}
|
||||||
'2':
|
2: {}
|
||||||
'3':
|
3: {}
|
||||||
'4':
|
4: {}
|
||||||
'5':
|
5: {}
|
||||||
'6':
|
6: {}
|
||||||
|
7:
|
||||||
|
constraints: "root-disk=20G mem=4G"
|
||||||
|
8:
|
||||||
|
constraints: "root-disk=20G mem=4G"
|
||||||
|
|
||||||
|
# We specify machine placements for these to improve iteration
|
||||||
|
# time, given that machine "0" comes up way before machine "7"
|
||||||
applications:
|
applications:
|
||||||
nova-compute:
|
percona-cluster:
|
||||||
charm: cs:~openstack-charmers-next/nova-compute
|
charm: cs:~openstack-charmers-next/percona-cluster
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: cloud:xenial-ocata
|
source: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '1'
|
- '0'
|
||||||
|
rabbitmq-server:
|
||||||
|
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '1'
|
||||||
|
neutron-api:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-api
|
||||||
|
series: *series
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
flat-network-providers: physnet1
|
||||||
|
neutron-security-groups: true
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '2'
|
||||||
|
keystone:
|
||||||
|
charm: cs:~openstack-charmers-next/keystone
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '3'
|
||||||
|
glance:
|
||||||
|
charm: cs:~openstack-charmers-next/glance
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '4'
|
||||||
|
neutron-openvswitch:
|
||||||
|
charm: ../../../neutron-openvswitch
|
||||||
|
neutron-gateway:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-gateway
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
bridge-mappings: physnet1:br-ex
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '5'
|
||||||
nova-cloud-controller:
|
nova-cloud-controller:
|
||||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
network-manager: Neutron
|
network-manager: Neutron
|
||||||
openstack-origin: cloud:xenial-ocata
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '2'
|
- '6'
|
||||||
rabbitmq-server:
|
nova-compute:
|
||||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
charm: cs:~openstack-charmers-next/nova-compute
|
||||||
num_units: 1
|
num_units: 2
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
keystone:
|
|
||||||
num_units: 1
|
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
options:
|
||||||
openstack-origin: cloud:xenial-ocata
|
config-flags: default_ephemeral_format=ext4
|
||||||
|
enable-live-migration: true
|
||||||
|
enable-resize: true
|
||||||
|
migration-auth-type: ssh
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '4'
|
- '7'
|
||||||
glance:
|
- '8'
|
||||||
charm: cs:~openstack-charmers-next/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:xenial-ocata
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers-next/neutron-api
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:xenial-ocata
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
percona-cluster:
|
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: ../../../neutron-openvswitch
|
|
||||||
|
|
||||||
relations:
|
relations:
|
||||||
- - 'neutron-openvswitch:amqp'
|
- - 'neutron-api:shared-db'
|
||||||
- 'rabbitmq-server:amqp'
|
- 'percona-cluster:shared-db'
|
||||||
- - 'neutron-openvswitch:neutron-plugin'
|
- - 'neutron-api:amqp'
|
||||||
- 'nova-compute:neutron-plugin'
|
- 'rabbitmq-server:amqp'
|
||||||
- - 'neutron-openvswitch:neutron-plugin-api'
|
- - 'neutron-api:neutron-api'
|
||||||
- 'neutron-api:neutron-plugin-api'
|
- 'nova-cloud-controller:neutron-api'
|
||||||
- - 'neutron-api:identity-service'
|
- - 'neutron-api:neutron-plugin-api'
|
||||||
- 'keystone:identity-service'
|
- 'neutron-gateway:neutron-plugin-api'
|
||||||
- - 'neutron-api:shared-db'
|
- - 'neutron-api:identity-service'
|
||||||
- 'percona-cluster:shared-db'
|
- 'keystone:identity-service'
|
||||||
- - 'neutron-api:amqp'
|
- - 'keystone:shared-db'
|
||||||
- 'rabbitmq-server:amqp'
|
- 'percona-cluster:shared-db'
|
||||||
- - 'nova-compute:amqp'
|
- - 'neutron-api:neutron-plugin-api'
|
||||||
- 'rabbitmq-server:amqp'
|
- 'neutron-openvswitch:neutron-plugin-api'
|
||||||
- - 'nova-compute:image-service'
|
- - 'nova-compute:neutron-plugin'
|
||||||
- 'glance:image-service'
|
- 'neutron-openvswitch:neutron-plugin'
|
||||||
- - 'glance:identity-service'
|
- - 'nova-cloud-controller:shared-db'
|
||||||
- 'keystone:identity-service'
|
- 'percona-cluster:shared-db'
|
||||||
- - 'glance:shared-db'
|
- - 'neutron-gateway:amqp'
|
||||||
- 'percona-cluster:shared-db'
|
- 'rabbitmq-server:amqp'
|
||||||
- - 'glance:amqp'
|
- - 'nova-cloud-controller:amqp'
|
||||||
- 'rabbitmq-server:amqp'
|
- 'rabbitmq-server:amqp'
|
||||||
- - 'keystone:shared-db'
|
- - 'nova-compute:amqp'
|
||||||
- 'percona-cluster:shared-db'
|
- 'rabbitmq-server:amqp'
|
||||||
- - 'nova-cloud-controller:shared-db'
|
- - 'neutron-openvswitch:amqp'
|
||||||
- 'percona-cluster:shared-db'
|
- 'rabbitmq-server:amqp'
|
||||||
- - 'nova-cloud-controller:amqp'
|
- - 'nova-cloud-controller:identity-service'
|
||||||
- 'rabbitmq-server:amqp'
|
- 'keystone:identity-service'
|
||||||
- - 'nova-cloud-controller:identity-service'
|
- - 'nova-cloud-controller:cloud-compute'
|
||||||
- 'keystone:identity-service'
|
- 'nova-compute:cloud-compute'
|
||||||
- - 'nova-cloud-controller:cloud-compute'
|
- - 'glance:identity-service'
|
||||||
- 'nova-compute:cloud-compute'
|
- 'keystone:identity-service'
|
||||||
- - 'nova-cloud-controller:image-service'
|
- - 'glance:shared-db'
|
||||||
- 'glance:image-service'
|
- 'percona-cluster:shared-db'
|
||||||
|
- - 'glance:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'nova-compute:image-service'
|
||||||
|
- 'glance:image-service'
|
||||||
|
- - 'nova-cloud-controller:image-service'
|
||||||
|
- 'glance:image-service'
|
||||||
|
- - 'nova-cloud-controller:quantum-network-service'
|
||||||
|
- 'neutron-gateway:quantum-network-service'
|
||||||
|
@ -1,98 +1,133 @@
|
|||||||
series: xenial
|
variables:
|
||||||
|
openstack-origin: &openstack-origin cloud:xenial-pike
|
||||||
|
|
||||||
|
series: &series xenial
|
||||||
|
|
||||||
machines:
|
machines:
|
||||||
'0':
|
0:
|
||||||
constraints: mem=3072M
|
constraints: "mem=3072M"
|
||||||
'1':
|
1: {}
|
||||||
'2':
|
2: {}
|
||||||
'3':
|
3: {}
|
||||||
'4':
|
4: {}
|
||||||
'5':
|
5: {}
|
||||||
'6':
|
6: {}
|
||||||
|
7:
|
||||||
|
constraints: "root-disk=20G mem=4G"
|
||||||
|
8:
|
||||||
|
constraints: "root-disk=20G mem=4G"
|
||||||
|
|
||||||
|
# We specify machine placements for these to improve iteration
|
||||||
|
# time, given that machine "0" comes up way before machine "7"
|
||||||
applications:
|
applications:
|
||||||
nova-compute:
|
percona-cluster:
|
||||||
charm: cs:~openstack-charmers-next/nova-compute
|
charm: cs:~openstack-charmers-next/percona-cluster
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: cloud:xenial-pike
|
source: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '1'
|
- '0'
|
||||||
|
rabbitmq-server:
|
||||||
|
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '1'
|
||||||
|
neutron-api:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-api
|
||||||
|
series: *series
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
flat-network-providers: physnet1
|
||||||
|
neutron-security-groups: true
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '2'
|
||||||
|
keystone:
|
||||||
|
charm: cs:~openstack-charmers-next/keystone
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '3'
|
||||||
|
glance:
|
||||||
|
charm: cs:~openstack-charmers-next/glance
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '4'
|
||||||
|
neutron-openvswitch:
|
||||||
|
charm: ../../../neutron-openvswitch
|
||||||
|
neutron-gateway:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-gateway
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
bridge-mappings: physnet1:br-ex
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '5'
|
||||||
nova-cloud-controller:
|
nova-cloud-controller:
|
||||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
network-manager: Neutron
|
network-manager: Neutron
|
||||||
openstack-origin: cloud:xenial-pike
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '2'
|
- '6'
|
||||||
rabbitmq-server:
|
nova-compute:
|
||||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
charm: cs:~openstack-charmers-next/nova-compute
|
||||||
num_units: 1
|
num_units: 2
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
keystone:
|
|
||||||
num_units: 1
|
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
options:
|
||||||
openstack-origin: cloud:xenial-pike
|
config-flags: default_ephemeral_format=ext4
|
||||||
|
enable-live-migration: true
|
||||||
|
enable-resize: true
|
||||||
|
migration-auth-type: ssh
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '4'
|
- '7'
|
||||||
glance:
|
- '8'
|
||||||
charm: cs:~openstack-charmers-next/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:xenial-pike
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers-next/neutron-api
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:xenial-pike
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
percona-cluster:
|
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: ../../../neutron-openvswitch
|
|
||||||
|
|
||||||
relations:
|
relations:
|
||||||
- - 'neutron-openvswitch:amqp'
|
- - 'neutron-api:shared-db'
|
||||||
- 'rabbitmq-server:amqp'
|
- 'percona-cluster:shared-db'
|
||||||
- - 'neutron-openvswitch:neutron-plugin'
|
- - 'neutron-api:amqp'
|
||||||
- 'nova-compute:neutron-plugin'
|
- 'rabbitmq-server:amqp'
|
||||||
- - 'neutron-openvswitch:neutron-plugin-api'
|
- - 'neutron-api:neutron-api'
|
||||||
- 'neutron-api:neutron-plugin-api'
|
- 'nova-cloud-controller:neutron-api'
|
||||||
- - 'neutron-api:identity-service'
|
- - 'neutron-api:neutron-plugin-api'
|
||||||
- 'keystone:identity-service'
|
- 'neutron-gateway:neutron-plugin-api'
|
||||||
- - 'neutron-api:shared-db'
|
- - 'neutron-api:identity-service'
|
||||||
- 'percona-cluster:shared-db'
|
- 'keystone:identity-service'
|
||||||
- - 'neutron-api:amqp'
|
- - 'keystone:shared-db'
|
||||||
- 'rabbitmq-server:amqp'
|
- 'percona-cluster:shared-db'
|
||||||
- - 'nova-compute:amqp'
|
- - 'neutron-api:neutron-plugin-api'
|
||||||
- 'rabbitmq-server:amqp'
|
- 'neutron-openvswitch:neutron-plugin-api'
|
||||||
- - 'nova-compute:image-service'
|
- - 'nova-compute:neutron-plugin'
|
||||||
- 'glance:image-service'
|
- 'neutron-openvswitch:neutron-plugin'
|
||||||
- - 'glance:identity-service'
|
- - 'nova-cloud-controller:shared-db'
|
||||||
- 'keystone:identity-service'
|
- 'percona-cluster:shared-db'
|
||||||
- - 'glance:shared-db'
|
- - 'neutron-gateway:amqp'
|
||||||
- 'percona-cluster:shared-db'
|
- 'rabbitmq-server:amqp'
|
||||||
- - 'glance:amqp'
|
- - 'nova-cloud-controller:amqp'
|
||||||
- 'rabbitmq-server:amqp'
|
- 'rabbitmq-server:amqp'
|
||||||
- - 'keystone:shared-db'
|
- - 'nova-compute:amqp'
|
||||||
- 'percona-cluster:shared-db'
|
- 'rabbitmq-server:amqp'
|
||||||
- - 'nova-cloud-controller:shared-db'
|
- - 'neutron-openvswitch:amqp'
|
||||||
- 'percona-cluster:shared-db'
|
- 'rabbitmq-server:amqp'
|
||||||
- - 'nova-cloud-controller:amqp'
|
- - 'nova-cloud-controller:identity-service'
|
||||||
- 'rabbitmq-server:amqp'
|
- 'keystone:identity-service'
|
||||||
- - 'nova-cloud-controller:identity-service'
|
- - 'nova-cloud-controller:cloud-compute'
|
||||||
- 'keystone:identity-service'
|
- 'nova-compute:cloud-compute'
|
||||||
- - 'nova-cloud-controller:cloud-compute'
|
- - 'glance:identity-service'
|
||||||
- 'nova-compute:cloud-compute'
|
- 'keystone:identity-service'
|
||||||
- - 'nova-cloud-controller:image-service'
|
- - 'glance:shared-db'
|
||||||
- 'glance:image-service'
|
- 'percona-cluster:shared-db'
|
||||||
|
- - 'glance:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'nova-compute:image-service'
|
||||||
|
- 'glance:image-service'
|
||||||
|
- - 'nova-cloud-controller:image-service'
|
||||||
|
- 'glance:image-service'
|
||||||
|
- - 'nova-cloud-controller:quantum-network-service'
|
||||||
|
- 'neutron-gateway:quantum-network-service'
|
||||||
|
125
tests/bundles/xenial-queens-dvr-snat.yaml
Normal file
125
tests/bundles/xenial-queens-dvr-snat.yaml
Normal file
@ -0,0 +1,125 @@
|
|||||||
|
variables:
|
||||||
|
openstack-origin: &openstack-origin cloud:xenial-queens
|
||||||
|
|
||||||
|
series: &series xenial
|
||||||
|
|
||||||
|
machines:
|
||||||
|
0:
|
||||||
|
constraints: "mem=3072M"
|
||||||
|
1: {}
|
||||||
|
2: {}
|
||||||
|
3: {}
|
||||||
|
4: {}
|
||||||
|
5: {}
|
||||||
|
6:
|
||||||
|
constraints: "root-disk=20G mem=4G"
|
||||||
|
7:
|
||||||
|
constraints: "root-disk=20G mem=4G"
|
||||||
|
|
||||||
|
# We specify machine placements for these to improve iteration
|
||||||
|
# time, given that machine "0" comes up way before machine "7"
|
||||||
|
applications:
|
||||||
|
percona-cluster:
|
||||||
|
charm: cs:~openstack-charmers-next/percona-cluster
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '0'
|
||||||
|
rabbitmq-server:
|
||||||
|
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '1'
|
||||||
|
neutron-api:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-api
|
||||||
|
series: *series
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
overlay-network-type: 'vxlan'
|
||||||
|
l2-population: True
|
||||||
|
flat-network-providers: physnet1
|
||||||
|
neutron-security-groups: true
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
enable-dvr: True
|
||||||
|
to:
|
||||||
|
- '2'
|
||||||
|
keystone:
|
||||||
|
charm: cs:~openstack-charmers-next/keystone
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '3'
|
||||||
|
glance:
|
||||||
|
charm: cs:~openstack-charmers-next/glance
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '4'
|
||||||
|
neutron-openvswitch:
|
||||||
|
charm: ../../../neutron-openvswitch
|
||||||
|
options:
|
||||||
|
use-dvr-snat: True
|
||||||
|
bridge-mappings: physnet1:br-ex
|
||||||
|
enable-local-dhcp-and-metadata: True
|
||||||
|
nova-cloud-controller:
|
||||||
|
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
network-manager: Neutron
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '5'
|
||||||
|
nova-compute:
|
||||||
|
charm: cs:~openstack-charmers-next/nova-compute
|
||||||
|
num_units: 2
|
||||||
|
options:
|
||||||
|
config-flags: default_ephemeral_format=ext4
|
||||||
|
enable-live-migration: true
|
||||||
|
enable-resize: true
|
||||||
|
migration-auth-type: ssh
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '6'
|
||||||
|
- '7'
|
||||||
|
relations:
|
||||||
|
- - 'neutron-api:shared-db'
|
||||||
|
- 'percona-cluster:shared-db'
|
||||||
|
- - 'neutron-api:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'neutron-api:neutron-api'
|
||||||
|
- 'nova-cloud-controller:neutron-api'
|
||||||
|
- - 'neutron-api:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
- - 'keystone:shared-db'
|
||||||
|
- 'percona-cluster:shared-db'
|
||||||
|
- - 'nova-compute:neutron-plugin'
|
||||||
|
- 'neutron-openvswitch:neutron-plugin'
|
||||||
|
- - 'neutron-api:neutron-plugin-api'
|
||||||
|
- 'neutron-openvswitch:neutron-plugin-api'
|
||||||
|
- - 'nova-cloud-controller:shared-db'
|
||||||
|
- 'percona-cluster:shared-db'
|
||||||
|
- - 'nova-cloud-controller:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'nova-compute:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'neutron-openvswitch:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'nova-cloud-controller:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
- - 'nova-cloud-controller:cloud-compute'
|
||||||
|
- 'nova-compute:cloud-compute'
|
||||||
|
- - 'glance:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
- - 'glance:shared-db'
|
||||||
|
- 'percona-cluster:shared-db'
|
||||||
|
- - 'glance:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
- - 'nova-compute:image-service'
|
||||||
|
- 'glance:image-service'
|
||||||
|
- - 'nova-cloud-controller:image-service'
|
||||||
|
- 'glance:image-service'
|
@ -1,98 +0,0 @@
|
|||||||
series: xenial
|
|
||||||
|
|
||||||
machines:
|
|
||||||
'0':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'1':
|
|
||||||
'2':
|
|
||||||
'3':
|
|
||||||
'4':
|
|
||||||
'5':
|
|
||||||
'6':
|
|
||||||
|
|
||||||
applications:
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers-next/nova-compute
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:xenial-queens
|
|
||||||
to:
|
|
||||||
- '1'
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
network-manager: Neutron
|
|
||||||
openstack-origin: cloud:xenial-queens
|
|
||||||
to:
|
|
||||||
- '2'
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
keystone:
|
|
||||||
num_units: 1
|
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:xenial-queens
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers-next/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:xenial-queens
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers-next/neutron-api
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:xenial-queens
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
percona-cluster:
|
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: ../../../neutron-openvswitch
|
|
||||||
|
|
||||||
relations:
|
|
||||||
- - 'neutron-openvswitch:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'neutron-openvswitch:neutron-plugin'
|
|
||||||
- 'nova-compute:neutron-plugin'
|
|
||||||
- - 'neutron-openvswitch:neutron-plugin-api'
|
|
||||||
- 'neutron-api:neutron-plugin-api'
|
|
||||||
- - 'neutron-api:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
- - 'neutron-api:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'neutron-api:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-compute:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-compute:image-service'
|
|
||||||
- 'glance:image-service'
|
|
||||||
- - 'glance:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
- - 'glance:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'glance:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'nova-cloud-controller:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'nova-cloud-controller:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-cloud-controller:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
- - 'nova-cloud-controller:cloud-compute'
|
|
||||||
- 'nova-compute:cloud-compute'
|
|
||||||
- - 'nova-cloud-controller:image-service'
|
|
||||||
- 'glance:image-service'
|
|
@ -1,25 +1,29 @@
|
|||||||
charm_name: neutron-openvswitch
|
charm_name: neutron-openvswitch
|
||||||
|
|
||||||
smoke_bundles:
|
smoke_bundles:
|
||||||
- bionic-ussuri
|
- bionic-ussuri-dvr-snat
|
||||||
|
|
||||||
gate_bundles:
|
gate_bundles:
|
||||||
- xenial-mitaka
|
- xenial-mitaka
|
||||||
- xenial-ocata
|
- xenial-ocata
|
||||||
- xenial-pike
|
- xenial-pike
|
||||||
- xenial-queens
|
- xenial-queens-dvr-snat
|
||||||
- bionic-queens
|
- bionic-queens-dvr-snat
|
||||||
- bionic-rocky
|
- bionic-rocky-dvr-snat
|
||||||
- bionic-stein
|
- bionic-stein-dvr-snat
|
||||||
- bionic-train
|
- bionic-train-dvr-snat
|
||||||
- bionic-ussuri
|
- bionic-ussuri-dvr-snat
|
||||||
- focal-ussuri
|
- focal-ussuri-dvr-snat
|
||||||
|
|
||||||
dev_bundles:
|
configure:
|
||||||
- focal-ussuri
|
- zaza.openstack.charm_tests.glance.setup.add_lts_image
|
||||||
|
- zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network
|
||||||
|
- zaza.openstack.charm_tests.nova.setup.create_flavors
|
||||||
|
- zaza.openstack.charm_tests.nova.setup.manage_ssh_key
|
||||||
|
|
||||||
tests:
|
tests:
|
||||||
|
- zaza.openstack.charm_tests.neutron.tests.NeutronNetworkingTest
|
||||||
- zaza.openstack.charm_tests.neutron.tests.NeutronOpenvSwitchTest
|
- zaza.openstack.charm_tests.neutron.tests.NeutronOpenvSwitchTest
|
||||||
tests_options:
|
tests_options:
|
||||||
force_deploy:
|
force_deploy:
|
||||||
- focal-ussuri
|
- focal-ussuri-dvr-snat
|
||||||
|
Loading…
x
Reference in New Issue
Block a user