Migrate charm charmhub for stable/wallaby
- start from stable/wallaby branch - Do charmcraft, osci, zuul changes - Modify libs to point to stable/wallaby for: - charmhelpers - charms.openstack (as needed) - zaza & zaza.openstack.tests - Remove unsupported test bundles - migration bundles to charmhub.io (ch: prefix + channels) - Build on 20.04 amd64 - Run on 20.04 amd64, s390x, ppc64el, arm64 Change-Id: I36a7c2d3578512a65392526f7e08eb72800ab5d7
This commit is contained in:
parent
fb8095ba85
commit
14d3bb727d
|
@ -14,3 +14,4 @@ xenial
|
||||||
.unit-state.db
|
.unit-state.db
|
||||||
func-results.json
|
func-results.json
|
||||||
__pycache__
|
__pycache__
|
||||||
|
*.charm
|
||||||
|
|
|
@ -3,4 +3,4 @@ host=review.opendev.org
|
||||||
port=29418
|
port=29418
|
||||||
project=openstack/charm-neutron-gateway.git
|
project=openstack/charm-neutron-gateway.git
|
||||||
|
|
||||||
defaultbranch=stable/21.10
|
defaultbranch=stable/wallaby
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- python35-charm-jobs
|
- openstack-python3-wallaby-jobs
|
||||||
- openstack-python3-ussuri-jobs
|
|
||||||
- openstack-cover-jobs
|
- openstack-cover-jobs
|
||||||
|
|
|
@ -0,0 +1,7 @@
|
||||||
|
# NOTES(lourot):
|
||||||
|
# * We don't install charmcraft via pip anymore because it anyway spins up a
|
||||||
|
# container and scp the system's charmcraft snap inside it. So the charmcraft
|
||||||
|
# snap is necessary on the system anyway.
|
||||||
|
# * `tox -e build` successfully validated with charmcraft 1.2.1
|
||||||
|
|
||||||
|
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
|
|
@ -1,4 +1,4 @@
|
||||||
repo: https://github.com/juju/charm-helpers@stable/21.10
|
repo: https://github.com/juju/charm-helpers@stable/wallaby
|
||||||
destination: hooks/charmhelpers
|
destination: hooks/charmhelpers
|
||||||
include:
|
include:
|
||||||
- core
|
- core
|
||||||
|
|
|
@ -0,0 +1,31 @@
|
||||||
|
type: charm
|
||||||
|
|
||||||
|
parts:
|
||||||
|
charm:
|
||||||
|
plugin: dump
|
||||||
|
source: .
|
||||||
|
prime:
|
||||||
|
- actions/*
|
||||||
|
- files/*
|
||||||
|
- hooks/*
|
||||||
|
- lib/*
|
||||||
|
- templates/*
|
||||||
|
- actions.yaml
|
||||||
|
- config.yaml
|
||||||
|
- copyright
|
||||||
|
- hardening.yaml
|
||||||
|
- icon.svg
|
||||||
|
- Makefile
|
||||||
|
- metadata.yaml
|
||||||
|
- README.md
|
||||||
|
|
||||||
|
bases:
|
||||||
|
- build-on:
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "20.04"
|
||||||
|
architectures:
|
||||||
|
- amd64
|
||||||
|
run-on:
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "20.04"
|
||||||
|
architectures: [amd64, s390x, ppc64el, arm64]
|
|
@ -16,12 +16,7 @@ description: |
|
||||||
tags:
|
tags:
|
||||||
- openstack
|
- openstack
|
||||||
series:
|
series:
|
||||||
- xenial
|
|
||||||
- bionic
|
|
||||||
- focal
|
- focal
|
||||||
- groovy
|
|
||||||
- hirsute
|
|
||||||
- impish
|
|
||||||
extra-bindings:
|
extra-bindings:
|
||||||
data:
|
data:
|
||||||
provides:
|
provides:
|
||||||
|
|
35
osci.yaml
35
osci.yaml
|
@ -1,14 +1,29 @@
|
||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- charm-unit-jobs
|
- charm-unit-jobs-py38
|
||||||
- charm-functional-jobs
|
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- focal-xena:
|
- focal-victoria_neutron-gateway-ovn
|
||||||
voting: false
|
- focal-wallaby_neutron-gateway-ovn
|
||||||
- impish-xena:
|
vars:
|
||||||
voting: false
|
needs_charm_build: true
|
||||||
# disabled as test flaps:
|
charm_build_name: neutron-gateway
|
||||||
# Bug: https://bugs.launchpad.net/charm-neutron-gateway/+bug/1945746
|
build_type: charmcraft
|
||||||
- hirsute-wallaby:
|
|
||||||
voting: false
|
- job:
|
||||||
|
name: focal-victoria_neutron-gateway-ovn
|
||||||
|
parent: func-target
|
||||||
|
dependencies:
|
||||||
|
- charm-build
|
||||||
|
- osci-lint
|
||||||
|
- tox-py38
|
||||||
|
vars:
|
||||||
|
tox_extra_args: "migrate-ovn:focal-victoria"
|
||||||
|
|
||||||
|
- job:
|
||||||
|
name: focal-wallaby_neutron-gateway-ovn
|
||||||
|
parent: func-target
|
||||||
|
dependencies:
|
||||||
|
- focal-victoria_neutron-gateway-ovn
|
||||||
|
vars:
|
||||||
|
tox_extra_args: "migrate-ovn:focal-wallaby"
|
||||||
|
|
|
@ -0,0 +1,13 @@
|
||||||
|
#!/bin/bash
|
||||||
|
charm=$(grep "charm_build_name" osci.yaml | awk '{print $2}')
|
||||||
|
echo "renaming ${charm}_*.charm to ${charm}.charm"
|
||||||
|
echo -n "pwd: "
|
||||||
|
pwd
|
||||||
|
ls -al
|
||||||
|
echo "Removing bad downloaded charm maybe?"
|
||||||
|
if [[ -e "${charm}.charm" ]];
|
||||||
|
then
|
||||||
|
rm "${charm}.charm"
|
||||||
|
fi
|
||||||
|
echo "Renaming charm here."
|
||||||
|
mv ${charm}_*.charm ${charm}.charm
|
|
@ -7,6 +7,7 @@
|
||||||
# requirements. They are intertwined. Also, Zaza itself should specify
|
# requirements. They are intertwined. Also, Zaza itself should specify
|
||||||
# all of its own requirements and if it doesn't, fix it there.
|
# all of its own requirements and if it doesn't, fix it there.
|
||||||
#
|
#
|
||||||
|
pyparsing<3.0.0 # cffi needs pyparsing < 3.0.0.
|
||||||
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
|
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
|
||||||
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
||||||
|
|
||||||
|
@ -37,11 +38,12 @@ oslo.utils<=3.41.0;python_version<'3.6'
|
||||||
|
|
||||||
coverage>=4.5.2
|
coverage>=4.5.2
|
||||||
pyudev # for ceph-* charm unit tests (need to fix the ceph-* charm unit tests/mocking)
|
pyudev # for ceph-* charm unit tests (need to fix the ceph-* charm unit tests/mocking)
|
||||||
git+https://github.com/openstack-charmers/zaza.git@stable/21.10#egg=zaza
|
git+https://github.com/openstack-charmers/zaza.git@stable/wallaby#egg=zaza
|
||||||
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.10#egg=zaza.openstack
|
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/wallaby#egg=zaza.openstack
|
||||||
|
|
||||||
# Needed for charm-glance:
|
# Needed for charm-glance:
|
||||||
git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.6'
|
git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.8'
|
||||||
|
tempest<31.0.0;python_version<'3.8' and python_version>='3.6'
|
||||||
tempest<24.0.0;python_version<'3.6'
|
tempest<24.0.0;python_version<'3.6'
|
||||||
|
|
||||||
croniter # needed for charm-rabbitmq-server unit tests
|
croniter # needed for charm-rabbitmq-server unit tests
|
||||||
|
|
|
@ -1,130 +0,0 @@
|
||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin distro
|
|
||||||
|
|
||||||
series: &series bionic
|
|
||||||
|
|
||||||
machines:
|
|
||||||
0:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
1: {}
|
|
||||||
2: {}
|
|
||||||
3: {}
|
|
||||||
4: {}
|
|
||||||
5: {}
|
|
||||||
6:
|
|
||||||
constraints: "mem=4G"
|
|
||||||
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:
|
|
||||||
percona-cluster:
|
|
||||||
charm: cs:~openstack-charmers/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '1'
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers/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/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
|
||||||
neutron-gateway:
|
|
||||||
charm: "../../../neutron-gateway"
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
bridge-mappings: physnet1:br-ex
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
network-manager: Neutron
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 2
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '7'
|
|
||||||
- '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:neutron-plugin-api'
|
|
||||||
- 'neutron-gateway:neutron-plugin-api'
|
|
||||||
- - 'neutron-api:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'nova-compute:neutron-plugin'
|
|
||||||
- 'neutron-openvswitch:neutron-plugin'
|
|
||||||
- - 'nova-cloud-controller:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'neutron-gateway:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-cloud-controller:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-compute:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'neutron-openvswitch:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'neutron-openvswitch:neutron-plugin-api'
|
|
||||||
- 'neutron-api:neutron-plugin-api'
|
|
||||||
- - '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'
|
|
||||||
- - 'nova-cloud-controller:quantum-network-service'
|
|
||||||
- 'neutron-gateway:quantum-network-service'
|
|
|
@ -1,130 +0,0 @@
|
||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin cloud:bionic-rocky
|
|
||||||
|
|
||||||
series: &series bionic
|
|
||||||
|
|
||||||
machines:
|
|
||||||
0:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
1: {}
|
|
||||||
2: {}
|
|
||||||
3: {}
|
|
||||||
4: {}
|
|
||||||
5: {}
|
|
||||||
6:
|
|
||||||
constraints: "mem=4G"
|
|
||||||
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:
|
|
||||||
percona-cluster:
|
|
||||||
charm: cs:~openstack-charmers/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '1'
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers/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/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
|
||||||
neutron-gateway:
|
|
||||||
charm: "../../../neutron-gateway"
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
bridge-mappings: physnet1:br-ex
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
network-manager: Neutron
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 2
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '7'
|
|
||||||
- '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:neutron-plugin-api'
|
|
||||||
- 'neutron-gateway:neutron-plugin-api'
|
|
||||||
- - 'neutron-api:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'nova-compute:neutron-plugin'
|
|
||||||
- 'neutron-openvswitch:neutron-plugin'
|
|
||||||
- - 'nova-cloud-controller:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'neutron-gateway:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-cloud-controller:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-compute:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'neutron-openvswitch:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'neutron-openvswitch:neutron-plugin-api'
|
|
||||||
- 'neutron-api:neutron-plugin-api'
|
|
||||||
- - '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'
|
|
||||||
- - 'nova-cloud-controller:quantum-network-service'
|
|
||||||
- 'neutron-gateway:quantum-network-service'
|
|
|
@ -1,130 +0,0 @@
|
||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin cloud:bionic-stein
|
|
||||||
|
|
||||||
series: &series bionic
|
|
||||||
|
|
||||||
machines:
|
|
||||||
0:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
1: {}
|
|
||||||
2: {}
|
|
||||||
3: {}
|
|
||||||
4: {}
|
|
||||||
5: {}
|
|
||||||
6:
|
|
||||||
constraints: "mem=4G"
|
|
||||||
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:
|
|
||||||
percona-cluster:
|
|
||||||
charm: cs:~openstack-charmers/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '1'
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers/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/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
|
||||||
neutron-gateway:
|
|
||||||
charm: "../../../neutron-gateway"
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
bridge-mappings: physnet1:br-ex
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
network-manager: Neutron
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 2
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '7'
|
|
||||||
- '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:neutron-plugin-api'
|
|
||||||
- 'neutron-gateway:neutron-plugin-api'
|
|
||||||
- - 'neutron-api:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'nova-compute:neutron-plugin'
|
|
||||||
- 'neutron-openvswitch:neutron-plugin'
|
|
||||||
- - 'nova-cloud-controller:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'neutron-gateway:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-cloud-controller:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-compute:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'neutron-openvswitch:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'neutron-openvswitch:neutron-plugin-api'
|
|
||||||
- 'neutron-api:neutron-plugin-api'
|
|
||||||
- - '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'
|
|
||||||
- - 'nova-cloud-controller:quantum-network-service'
|
|
||||||
- 'neutron-gateway:quantum-network-service'
|
|
|
@ -1,143 +0,0 @@
|
||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin cloud:bionic-train
|
|
||||||
|
|
||||||
series: &series bionic
|
|
||||||
|
|
||||||
machines:
|
|
||||||
0:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
1: {}
|
|
||||||
2: {}
|
|
||||||
3: {}
|
|
||||||
4: {}
|
|
||||||
5: {}
|
|
||||||
6:
|
|
||||||
constraints: "mem=4G"
|
|
||||||
7:
|
|
||||||
constraints: "root-disk=20G mem=4G"
|
|
||||||
8:
|
|
||||||
constraints: "root-disk=20G mem=4G"
|
|
||||||
9: {}
|
|
||||||
# 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/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '1'
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers/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/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
|
||||||
neutron-gateway:
|
|
||||||
charm: "../../../neutron-gateway"
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
bridge-mappings: physnet1:br-ex
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
network-manager: Neutron
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 2
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '7'
|
|
||||||
- '8'
|
|
||||||
placement:
|
|
||||||
charm: cs:~openstack-charmers/placement
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '9'
|
|
||||||
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:neutron-plugin-api'
|
|
||||||
- 'neutron-gateway:neutron-plugin-api'
|
|
||||||
- - 'neutron-api:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'nova-compute:neutron-plugin'
|
|
||||||
- 'neutron-openvswitch:neutron-plugin'
|
|
||||||
- - 'nova-cloud-controller:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'neutron-gateway:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-cloud-controller:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-compute:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'neutron-openvswitch:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'neutron-openvswitch:neutron-plugin-api'
|
|
||||||
- 'neutron-api:neutron-plugin-api'
|
|
||||||
- - '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'
|
|
||||||
- - 'nova-cloud-controller:quantum-network-service'
|
|
||||||
- 'neutron-gateway:quantum-network-service'
|
|
||||||
- - 'placement:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'placement:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
- - 'placement:placement'
|
|
||||||
- 'nova-cloud-controller:placement'
|
|
|
@ -1,144 +0,0 @@
|
||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin cloud:bionic-ussuri
|
|
||||||
|
|
||||||
series: &series bionic
|
|
||||||
|
|
||||||
machines:
|
|
||||||
0:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
1: {}
|
|
||||||
2: {}
|
|
||||||
3: {}
|
|
||||||
4: {}
|
|
||||||
5: {}
|
|
||||||
6:
|
|
||||||
constraints: "mem=4G"
|
|
||||||
7:
|
|
||||||
constraints: "root-disk=20G mem=4G"
|
|
||||||
8:
|
|
||||||
constraints: "root-disk=20G mem=4G"
|
|
||||||
9: {}
|
|
||||||
# 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/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '1'
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers/neutron-api
|
|
||||||
series: *series
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
manage-neutron-plugin-legacy-mode: true
|
|
||||||
flat-network-providers: physnet1
|
|
||||||
neutron-security-groups: true
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '2'
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
|
||||||
neutron-gateway:
|
|
||||||
charm: "../../../neutron-gateway"
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
bridge-mappings: physnet1:br-ex
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
network-manager: Neutron
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 2
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '7'
|
|
||||||
- '8'
|
|
||||||
placement:
|
|
||||||
charm: cs:~openstack-charmers/placement
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '9'
|
|
||||||
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:neutron-plugin-api'
|
|
||||||
- 'neutron-gateway:neutron-plugin-api'
|
|
||||||
- - 'neutron-api:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'nova-compute:neutron-plugin'
|
|
||||||
- 'neutron-openvswitch:neutron-plugin'
|
|
||||||
- - 'nova-cloud-controller:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'neutron-gateway:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-cloud-controller:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-compute:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'neutron-openvswitch:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'neutron-openvswitch:neutron-plugin-api'
|
|
||||||
- 'neutron-api:neutron-plugin-api'
|
|
||||||
- - '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'
|
|
||||||
- - 'nova-cloud-controller:quantum-network-service'
|
|
||||||
- 'neutron-gateway:quantum-network-service'
|
|
||||||
- - 'placement:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'placement:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
- - 'placement:placement'
|
|
||||||
- 'nova-cloud-controller:placement'
|
|
|
@ -1,270 +0,0 @@
|
||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin distro
|
|
||||||
|
|
||||||
series: &series focal
|
|
||||||
|
|
||||||
machines:
|
|
||||||
0:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
1:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
2:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
3: {}
|
|
||||||
4: {}
|
|
||||||
5: {}
|
|
||||||
6: {}
|
|
||||||
7: {}
|
|
||||||
8:
|
|
||||||
constraints: "mem=4G"
|
|
||||||
9:
|
|
||||||
constraints: "root-disk=20G mem=4G"
|
|
||||||
10:
|
|
||||||
constraints: "root-disk=20G mem=4G"
|
|
||||||
11: {}
|
|
||||||
12: {}
|
|
||||||
13: {}
|
|
||||||
|
|
||||||
# We specify machine placements for these to improve iteration
|
|
||||||
# time, given that machine "0" comes up way before machine "7"
|
|
||||||
applications:
|
|
||||||
|
|
||||||
neutron-api-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
keystone-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
nova-cloud-controller-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
glance-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
placement-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
|
|
||||||
mysql-innodb-cluster:
|
|
||||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
- '1'
|
|
||||||
- '2'
|
|
||||||
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers/neutron-api
|
|
||||||
series: *series
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
manage-neutron-plugin-legacy-mode: true
|
|
||||||
flat-network-providers: physnet1
|
|
||||||
neutron-security-groups: true
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
|
||||||
neutron-gateway:
|
|
||||||
charm: "../../../neutron-gateway"
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
bridge-mappings: physnet1:br-ex
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '7'
|
|
||||||
|
|
||||||
ovn-dedicated-chassis:
|
|
||||||
charm: cs:~openstack-charmers/ovn-dedicated-chassis
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
# start new units paused to allow unit by unit OVS to OVN migration
|
|
||||||
new-units-paused: true
|
|
||||||
to:
|
|
||||||
# NOTE: We deliberately colocate the ovn-dedicated-chassis with the
|
|
||||||
# neutron-gateway for migration test purposes.
|
|
||||||
- '7'
|
|
||||||
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
network-manager: Neutron
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '8'
|
|
||||||
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 2
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '9'
|
|
||||||
- '10'
|
|
||||||
|
|
||||||
placement:
|
|
||||||
charm: cs:~openstack-charmers/placement
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '11'
|
|
||||||
|
|
||||||
vault-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
vault:
|
|
||||||
charm: cs:~openstack-charmers/vault
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '12'
|
|
||||||
ovn-central:
|
|
||||||
charm: cs:~openstack-charmers/ovn-central
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '13'
|
|
||||||
neutron-api-plugin-ovn:
|
|
||||||
charm: cs:~openstack-charmers/neutron-api-plugin-ovn
|
|
||||||
ovn-chassis:
|
|
||||||
charm: cs:~openstack-charmers/ovn-chassis
|
|
||||||
options:
|
|
||||||
# start new units paused to allow unit by unit OVS to OVN migration
|
|
||||||
new-units-paused: true
|
|
||||||
|
|
||||||
relations:
|
|
||||||
|
|
||||||
- - 'neutron-api:shared-db'
|
|
||||||
- 'neutron-api-mysql-router:shared-db'
|
|
||||||
- - 'neutron-api-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'neutron-api:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'neutron-api:neutron-api'
|
|
||||||
- 'nova-cloud-controller:neutron-api'
|
|
||||||
|
|
||||||
- - 'neutron-api:neutron-plugin-api'
|
|
||||||
- 'neutron-gateway:neutron-plugin-api'
|
|
||||||
|
|
||||||
- - 'neutron-api:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'keystone-mysql-router:shared-db'
|
|
||||||
- - 'keystone-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'nova-compute:neutron-plugin'
|
|
||||||
- 'neutron-openvswitch:neutron-plugin'
|
|
||||||
|
|
||||||
- - 'nova-cloud-controller:shared-db'
|
|
||||||
- 'nova-cloud-controller-mysql-router:shared-db'
|
|
||||||
- - 'nova-cloud-controller-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'neutron-gateway:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'nova-cloud-controller:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'nova-compute:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'neutron-openvswitch:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'neutron-openvswitch:neutron-plugin-api'
|
|
||||||
- 'neutron-api:neutron-plugin-api'
|
|
||||||
|
|
||||||
- - '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'
|
|
||||||
- 'glance-mysql-router:shared-db'
|
|
||||||
- - 'glance-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - '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'
|
|
||||||
|
|
||||||
- - 'placement:shared-db'
|
|
||||||
- 'placement-mysql-router:shared-db'
|
|
||||||
- - 'placement-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'placement:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'placement:placement'
|
|
||||||
- 'nova-cloud-controller:placement'
|
|
||||||
|
|
||||||
# We need to defer the addition of the neutron-api-plugin-ovn subordinate
|
|
||||||
# relation to the functional test as the test will first validate the legacy
|
|
||||||
# Neutron ML2+OVS topology, migrate it to OVN and then confirm connectivity
|
|
||||||
# post migration.
|
|
||||||
#
|
|
||||||
# - - neutron-api-plugin-ovn:neutron-plugin
|
|
||||||
# - neutron-api:neutron-plugin-api-subordinate
|
|
||||||
- - ovn-central:certificates
|
|
||||||
- vault:certificates
|
|
||||||
- - ovn-central:ovsdb-cms
|
|
||||||
- neutron-api-plugin-ovn:ovsdb-cms
|
|
||||||
- - ovn-chassis:nova-compute
|
|
||||||
- nova-compute:neutron-plugin
|
|
||||||
- - ovn-chassis:certificates
|
|
||||||
- vault:certificates
|
|
||||||
- - ovn-chassis:ovsdb
|
|
||||||
- ovn-central:ovsdb
|
|
||||||
- - ovn-dedicated-chassis:certificates
|
|
||||||
- vault:certificates
|
|
||||||
- - ovn-dedicated-chassis:ovsdb
|
|
||||||
- ovn-central:ovsdb
|
|
||||||
- - vault:certificates
|
|
||||||
- neutron-api-plugin-ovn:certificates
|
|
||||||
- - vault:shared-db
|
|
||||||
- vault-mysql-router:shared-db
|
|
||||||
- - vault-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
local_overlay_enabled: False
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
openstack-origin: &openstack-origin cloud:focal-victoria
|
openstack-origin: &openstack-origin cloud:focal-victoria
|
||||||
|
|
||||||
|
@ -30,18 +32,23 @@ machines:
|
||||||
applications:
|
applications:
|
||||||
|
|
||||||
neutron-api-mysql-router:
|
neutron-api-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0/edge
|
||||||
keystone-mysql-router:
|
keystone-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0/edge
|
||||||
nova-cloud-controller-mysql-router:
|
nova-cloud-controller-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0/edge
|
||||||
glance-mysql-router:
|
glance-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0/edge
|
||||||
placement-mysql-router:
|
placement-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0/edge
|
||||||
|
|
||||||
mysql-innodb-cluster:
|
mysql-innodb-cluster:
|
||||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
charm: ch:mysql-innodb-cluster
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
options:
|
||||||
source: *openstack-origin
|
source: *openstack-origin
|
||||||
|
@ -49,18 +56,20 @@ applications:
|
||||||
- '0'
|
- '0'
|
||||||
- '1'
|
- '1'
|
||||||
- '2'
|
- '2'
|
||||||
|
channel: 8.0/edge
|
||||||
|
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
charm: ch:rabbitmq-server
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
options:
|
options:
|
||||||
source: *openstack-origin
|
source: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '3'
|
- '3'
|
||||||
|
channel: 3.8/edge
|
||||||
|
|
||||||
neutron-api:
|
neutron-api:
|
||||||
charm: cs:~openstack-charmers/neutron-api
|
charm: ch:neutron-api
|
||||||
series: *series
|
series: *series
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
|
@ -70,27 +79,31 @@ applications:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '4'
|
- '4'
|
||||||
|
channel: wallaby/edge
|
||||||
|
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers/keystone
|
charm: ch:keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '5'
|
- '5'
|
||||||
|
channel: wallaby/edge
|
||||||
|
|
||||||
glance:
|
glance:
|
||||||
charm: cs:~openstack-charmers/glance
|
charm: ch:glance
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '6'
|
- '6'
|
||||||
|
channel: wallaby/edge
|
||||||
|
|
||||||
neutron-openvswitch:
|
neutron-openvswitch:
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
charm: ch:neutron-openvswitch
|
||||||
|
channel: wallaby/edge
|
||||||
neutron-gateway:
|
neutron-gateway:
|
||||||
charm: "../../../neutron-gateway"
|
charm: ../../neutron-gateway.charm
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
bridge-mappings: physnet1:br-ex
|
bridge-mappings: physnet1:br-ex
|
||||||
|
@ -99,7 +112,7 @@ applications:
|
||||||
- '7'
|
- '7'
|
||||||
|
|
||||||
ovn-dedicated-chassis:
|
ovn-dedicated-chassis:
|
||||||
charm: cs:~openstack-charmers/ovn-dedicated-chassis
|
charm: ch:ovn-dedicated-chassis
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
# start new units paused to allow unit by unit OVS to OVN migration
|
# start new units paused to allow unit by unit OVS to OVN migration
|
||||||
|
@ -108,54 +121,63 @@ applications:
|
||||||
# NOTE: We deliberately colocate the ovn-dedicated-chassis with the
|
# NOTE: We deliberately colocate the ovn-dedicated-chassis with the
|
||||||
# neutron-gateway for migration test purposes.
|
# neutron-gateway for migration test purposes.
|
||||||
- '7'
|
- '7'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
nova-cloud-controller:
|
nova-cloud-controller:
|
||||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
charm: ch:nova-cloud-controller
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
network-manager: Neutron
|
network-manager: Neutron
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '8'
|
- '8'
|
||||||
|
channel: wallaby/edge
|
||||||
|
|
||||||
nova-compute:
|
nova-compute:
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
charm: ch:nova-compute
|
||||||
num_units: 2
|
num_units: 2
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '9'
|
- '9'
|
||||||
- '10'
|
- '10'
|
||||||
|
channel: wallaby/edge
|
||||||
|
|
||||||
placement:
|
placement:
|
||||||
charm: cs:~openstack-charmers/placement
|
charm: ch:placement
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '11'
|
- '11'
|
||||||
|
channel: wallaby/edge
|
||||||
|
|
||||||
vault-mysql-router:
|
vault-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0/edge
|
||||||
vault:
|
vault:
|
||||||
charm: cs:~openstack-charmers/vault
|
charm: ch:vault
|
||||||
num_units: 1
|
num_units: 1
|
||||||
to:
|
to:
|
||||||
- '12'
|
- '12'
|
||||||
|
channel: 1.7/edge
|
||||||
ovn-central:
|
ovn-central:
|
||||||
charm: cs:~openstack-charmers/ovn-central
|
charm: ch:ovn-central
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
options:
|
||||||
source: *openstack-origin
|
source: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '13'
|
- '13'
|
||||||
|
channel: latest/edge
|
||||||
neutron-api-plugin-ovn:
|
neutron-api-plugin-ovn:
|
||||||
charm: cs:~openstack-charmers/neutron-api-plugin-ovn
|
charm: ch:neutron-api-plugin-ovn
|
||||||
|
channel: wallaby/edge
|
||||||
ovn-chassis:
|
ovn-chassis:
|
||||||
charm: cs:~openstack-charmers/ovn-chassis
|
charm: ch:ovn-chassis
|
||||||
options:
|
options:
|
||||||
# start new units paused to allow unit by unit OVS to OVN migration
|
# start new units paused to allow unit by unit OVS to OVN migration
|
||||||
new-units-paused: true
|
new-units-paused: true
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
relations:
|
relations:
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
local_overlay_enabled: False
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
openstack-origin: &openstack-origin cloud:focal-wallaby
|
openstack-origin: &openstack-origin cloud:focal-wallaby
|
||||||
|
|
||||||
|
@ -30,18 +32,23 @@ machines:
|
||||||
applications:
|
applications:
|
||||||
|
|
||||||
neutron-api-mysql-router:
|
neutron-api-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0/edge
|
||||||
keystone-mysql-router:
|
keystone-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0/edge
|
||||||
nova-cloud-controller-mysql-router:
|
nova-cloud-controller-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0/edge
|
||||||
glance-mysql-router:
|
glance-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0/edge
|
||||||
placement-mysql-router:
|
placement-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0/edge
|
||||||
|
|
||||||
mysql-innodb-cluster:
|
mysql-innodb-cluster:
|
||||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
charm: ch:mysql-innodb-cluster
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
options:
|
||||||
source: *openstack-origin
|
source: *openstack-origin
|
||||||
|
@ -49,18 +56,20 @@ applications:
|
||||||
- '0'
|
- '0'
|
||||||
- '1'
|
- '1'
|
||||||
- '2'
|
- '2'
|
||||||
|
channel: 8.0/edge
|
||||||
|
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
charm: ch:rabbitmq-server
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
options:
|
options:
|
||||||
source: *openstack-origin
|
source: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '3'
|
- '3'
|
||||||
|
channel: 3.8/edge
|
||||||
|
|
||||||
neutron-api:
|
neutron-api:
|
||||||
charm: cs:~openstack-charmers/neutron-api
|
charm: ch:neutron-api
|
||||||
series: *series
|
series: *series
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
|
@ -70,27 +79,31 @@ applications:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '4'
|
- '4'
|
||||||
|
channel: wallaby/edge
|
||||||
|
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers/keystone
|
charm: ch:keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '5'
|
- '5'
|
||||||
|
channel: wallaby/edge
|
||||||
|
|
||||||
glance:
|
glance:
|
||||||
charm: cs:~openstack-charmers/glance
|
charm: ch:glance
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '6'
|
- '6'
|
||||||
|
channel: wallaby/edge
|
||||||
|
|
||||||
neutron-openvswitch:
|
neutron-openvswitch:
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
charm: ch:neutron-openvswitch
|
||||||
|
channel: wallaby/edge
|
||||||
neutron-gateway:
|
neutron-gateway:
|
||||||
charm: "../../../neutron-gateway"
|
charm: ../../neutron-gateway.charm
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
bridge-mappings: physnet1:br-ex
|
bridge-mappings: physnet1:br-ex
|
||||||
|
@ -99,7 +112,7 @@ applications:
|
||||||
- '7'
|
- '7'
|
||||||
|
|
||||||
ovn-dedicated-chassis:
|
ovn-dedicated-chassis:
|
||||||
charm: cs:~openstack-charmers/ovn-dedicated-chassis
|
charm: ch:ovn-dedicated-chassis
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
# start new units paused to allow unit by unit OVS to OVN migration
|
# start new units paused to allow unit by unit OVS to OVN migration
|
||||||
|
@ -108,54 +121,63 @@ applications:
|
||||||
# NOTE: We deliberately colocate the ovn-dedicated-chassis with the
|
# NOTE: We deliberately colocate the ovn-dedicated-chassis with the
|
||||||
# neutron-gateway for migration test purposes.
|
# neutron-gateway for migration test purposes.
|
||||||
- '7'
|
- '7'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
nova-cloud-controller:
|
nova-cloud-controller:
|
||||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
charm: ch:nova-cloud-controller
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
network-manager: Neutron
|
network-manager: Neutron
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '8'
|
- '8'
|
||||||
|
channel: wallaby/edge
|
||||||
|
|
||||||
nova-compute:
|
nova-compute:
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
charm: ch:nova-compute
|
||||||
num_units: 2
|
num_units: 2
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '9'
|
- '9'
|
||||||
- '10'
|
- '10'
|
||||||
|
channel: wallaby/edge
|
||||||
|
|
||||||
placement:
|
placement:
|
||||||
charm: cs:~openstack-charmers/placement
|
charm: ch:placement
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '11'
|
- '11'
|
||||||
|
channel: wallaby/edge
|
||||||
|
|
||||||
vault-mysql-router:
|
vault-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0/edge
|
||||||
vault:
|
vault:
|
||||||
charm: cs:~openstack-charmers/vault
|
charm: ch:vault
|
||||||
num_units: 1
|
num_units: 1
|
||||||
to:
|
to:
|
||||||
- '12'
|
- '12'
|
||||||
|
channel: 1.7/edge
|
||||||
ovn-central:
|
ovn-central:
|
||||||
charm: cs:~openstack-charmers/ovn-central
|
charm: ch:ovn-central
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
options:
|
||||||
source: *openstack-origin
|
source: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '13'
|
- '13'
|
||||||
|
channel: latest/edge
|
||||||
neutron-api-plugin-ovn:
|
neutron-api-plugin-ovn:
|
||||||
charm: cs:~openstack-charmers/neutron-api-plugin-ovn
|
charm: ch:neutron-api-plugin-ovn
|
||||||
|
channel: wallaby/edge
|
||||||
ovn-chassis:
|
ovn-chassis:
|
||||||
charm: cs:~openstack-charmers/ovn-chassis
|
charm: ch:ovn-chassis
|
||||||
options:
|
options:
|
||||||
# start new units paused to allow unit by unit OVS to OVN migration
|
# start new units paused to allow unit by unit OVS to OVN migration
|
||||||
new-units-paused: true
|
new-units-paused: true
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
relations:
|
relations:
|
||||||
|
|
||||||
|
|
|
@ -1,270 +0,0 @@
|
||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin cloud:focal-xena
|
|
||||||
|
|
||||||
series: &series focal
|
|
||||||
|
|
||||||
machines:
|
|
||||||
0:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
1:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
2:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
3: {}
|
|
||||||
4: {}
|
|
||||||
5: {}
|
|
||||||
6: {}
|
|
||||||
7: {}
|
|
||||||
8:
|
|
||||||
constraints: "mem=4G"
|
|
||||||
9:
|
|
||||||
constraints: "root-disk=20G mem=4G"
|
|
||||||
10:
|
|
||||||
constraints: "root-disk=20G mem=4G"
|
|
||||||
11: {}
|
|
||||||
12: {}
|
|
||||||
13: {}
|
|
||||||
|
|
||||||
# We specify machine placements for these to improve iteration
|
|
||||||
# time, given that machine "0" comes up way before machine "7"
|
|
||||||
applications:
|
|
||||||
|
|
||||||
neutron-api-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
keystone-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
nova-cloud-controller-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
glance-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
placement-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
|
|
||||||
mysql-innodb-cluster:
|
|
||||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
- '1'
|
|
||||||
- '2'
|
|
||||||
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers/neutron-api
|
|
||||||
series: *series
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
manage-neutron-plugin-legacy-mode: true
|
|
||||||
flat-network-providers: physnet1
|
|
||||||
neutron-security-groups: true
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
|
||||||
neutron-gateway:
|
|
||||||
charm: "../../../neutron-gateway"
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
bridge-mappings: physnet1:br-ex
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '7'
|
|
||||||
|
|
||||||
ovn-dedicated-chassis:
|
|
||||||
charm: cs:~openstack-charmers/ovn-dedicated-chassis
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
# start new units paused to allow unit by unit OVS to OVN migration
|
|
||||||
new-units-paused: true
|
|
||||||
to:
|
|
||||||
# NOTE: We deliberately colocate the ovn-dedicated-chassis with the
|
|
||||||
# neutron-gateway for migration test purposes.
|
|
||||||
- '7'
|
|
||||||
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
network-manager: Neutron
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '8'
|
|
||||||
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 2
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '9'
|
|
||||||
- '10'
|
|
||||||
|
|
||||||
placement:
|
|
||||||
charm: cs:~openstack-charmers/placement
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '11'
|
|
||||||
|
|
||||||
vault-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
vault:
|
|
||||||
charm: cs:~openstack-charmers/vault
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '12'
|
|
||||||
ovn-central:
|
|
||||||
charm: cs:~openstack-charmers/ovn-central
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '13'
|
|
||||||
neutron-api-plugin-ovn:
|
|
||||||
charm: cs:~openstack-charmers/neutron-api-plugin-ovn
|
|
||||||
ovn-chassis:
|
|
||||||
charm: cs:~openstack-charmers/ovn-chassis
|
|
||||||
options:
|
|
||||||
# start new units paused to allow unit by unit OVS to OVN migration
|
|
||||||
new-units-paused: true
|
|
||||||
|
|
||||||
relations:
|
|
||||||
|
|
||||||
- - 'neutron-api:shared-db'
|
|
||||||
- 'neutron-api-mysql-router:shared-db'
|
|
||||||
- - 'neutron-api-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'neutron-api:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'neutron-api:neutron-api'
|
|
||||||
- 'nova-cloud-controller:neutron-api'
|
|
||||||
|
|
||||||
- - 'neutron-api:neutron-plugin-api'
|
|
||||||
- 'neutron-gateway:neutron-plugin-api'
|
|
||||||
|
|
||||||
- - 'neutron-api:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'keystone-mysql-router:shared-db'
|
|
||||||
- - 'keystone-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'nova-compute:neutron-plugin'
|
|
||||||
- 'neutron-openvswitch:neutron-plugin'
|
|
||||||
|
|
||||||
- - 'nova-cloud-controller:shared-db'
|
|
||||||
- 'nova-cloud-controller-mysql-router:shared-db'
|
|
||||||
- - 'nova-cloud-controller-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'neutron-gateway:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'nova-cloud-controller:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'nova-compute:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'neutron-openvswitch:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'neutron-openvswitch:neutron-plugin-api'
|
|
||||||
- 'neutron-api:neutron-plugin-api'
|
|
||||||
|
|
||||||
- - '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'
|
|
||||||
- 'glance-mysql-router:shared-db'
|
|
||||||
- - 'glance-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - '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'
|
|
||||||
|
|
||||||
- - 'placement:shared-db'
|
|
||||||
- 'placement-mysql-router:shared-db'
|
|
||||||
- - 'placement-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'placement:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'placement:placement'
|
|
||||||
- 'nova-cloud-controller:placement'
|
|
||||||
|
|
||||||
# We need to defer the addition of the neutron-api-plugin-ovn subordinate
|
|
||||||
# relation to the functional test as the test will first validate the legacy
|
|
||||||
# Neutron ML2+OVS topology, migrate it to OVN and then confirm connectivity
|
|
||||||
# post migration.
|
|
||||||
#
|
|
||||||
# - - neutron-api-plugin-ovn:neutron-plugin
|
|
||||||
# - neutron-api:neutron-plugin-api-subordinate
|
|
||||||
- - ovn-central:certificates
|
|
||||||
- vault:certificates
|
|
||||||
- - ovn-central:ovsdb-cms
|
|
||||||
- neutron-api-plugin-ovn:ovsdb-cms
|
|
||||||
- - ovn-chassis:nova-compute
|
|
||||||
- nova-compute:neutron-plugin
|
|
||||||
- - ovn-chassis:certificates
|
|
||||||
- vault:certificates
|
|
||||||
- - ovn-chassis:ovsdb
|
|
||||||
- ovn-central:ovsdb
|
|
||||||
- - ovn-dedicated-chassis:certificates
|
|
||||||
- vault:certificates
|
|
||||||
- - ovn-dedicated-chassis:ovsdb
|
|
||||||
- ovn-central:ovsdb
|
|
||||||
- - vault:certificates
|
|
||||||
- neutron-api-plugin-ovn:certificates
|
|
||||||
- - vault:shared-db
|
|
||||||
- vault-mysql-router:shared-db
|
|
||||||
- - vault-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
|
@ -1,270 +0,0 @@
|
||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin distro
|
|
||||||
|
|
||||||
series: &series groovy
|
|
||||||
|
|
||||||
machines:
|
|
||||||
0:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
1:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
2:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
3: {}
|
|
||||||
4: {}
|
|
||||||
5: {}
|
|
||||||
6: {}
|
|
||||||
7: {}
|
|
||||||
8:
|
|
||||||
constraints: "mem=4G"
|
|
||||||
9:
|
|
||||||
constraints: "root-disk=20G mem=4G"
|
|
||||||
10:
|
|
||||||
constraints: "root-disk=20G mem=4G"
|
|
||||||
11: {}
|
|
||||||
12: {}
|
|
||||||
13: {}
|
|
||||||
|
|
||||||
# We specify machine placements for these to improve iteration
|
|
||||||
# time, given that machine "0" comes up way before machine "7"
|
|
||||||
applications:
|
|
||||||
|
|
||||||
neutron-api-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
keystone-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
nova-cloud-controller-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
glance-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
placement-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
|
|
||||||
mysql-innodb-cluster:
|
|
||||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
- '1'
|
|
||||||
- '2'
|
|
||||||
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers/neutron-api
|
|
||||||
series: *series
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
manage-neutron-plugin-legacy-mode: true
|
|
||||||
flat-network-providers: physnet1
|
|
||||||
neutron-security-groups: true
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
|
||||||
neutron-gateway:
|
|
||||||
charm: "../../../neutron-gateway"
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
bridge-mappings: physnet1:br-ex
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '7'
|
|
||||||
|
|
||||||
ovn-dedicated-chassis:
|
|
||||||
charm: cs:~openstack-charmers/ovn-dedicated-chassis
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
# start new units paused to allow unit by unit OVS to OVN migration
|
|
||||||
new-units-paused: true
|
|
||||||
to:
|
|
||||||
# NOTE: We deliberately colocate the ovn-dedicated-chassis with the
|
|
||||||
# neutron-gateway for migration test purposes.
|
|
||||||
- '7'
|
|
||||||
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
network-manager: Neutron
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '8'
|
|
||||||
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 2
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '9'
|
|
||||||
- '10'
|
|
||||||
|
|
||||||
placement:
|
|
||||||
charm: cs:~openstack-charmers/placement
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '11'
|
|
||||||
|
|
||||||
vault-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
vault:
|
|
||||||
charm: cs:~openstack-charmers/vault
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '12'
|
|
||||||
ovn-central:
|
|
||||||
charm: cs:~openstack-charmers/ovn-central
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '13'
|
|
||||||
neutron-api-plugin-ovn:
|
|
||||||
charm: cs:~openstack-charmers/neutron-api-plugin-ovn
|
|
||||||
ovn-chassis:
|
|
||||||
charm: cs:~openstack-charmers/ovn-chassis
|
|
||||||
options:
|
|
||||||
# start new units paused to allow unit by unit OVS to OVN migration
|
|
||||||
new-units-paused: true
|
|
||||||
|
|
||||||
relations:
|
|
||||||
|
|
||||||
- - 'neutron-api:shared-db'
|
|
||||||
- 'neutron-api-mysql-router:shared-db'
|
|
||||||
- - 'neutron-api-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'neutron-api:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'neutron-api:neutron-api'
|
|
||||||
- 'nova-cloud-controller:neutron-api'
|
|
||||||
|
|
||||||
- - 'neutron-api:neutron-plugin-api'
|
|
||||||
- 'neutron-gateway:neutron-plugin-api'
|
|
||||||
|
|
||||||
- - 'neutron-api:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'keystone-mysql-router:shared-db'
|
|
||||||
- - 'keystone-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'nova-compute:neutron-plugin'
|
|
||||||
- 'neutron-openvswitch:neutron-plugin'
|
|
||||||
|
|
||||||
- - 'nova-cloud-controller:shared-db'
|
|
||||||
- 'nova-cloud-controller-mysql-router:shared-db'
|
|
||||||
- - 'nova-cloud-controller-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'neutron-gateway:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'nova-cloud-controller:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'nova-compute:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'neutron-openvswitch:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'neutron-openvswitch:neutron-plugin-api'
|
|
||||||
- 'neutron-api:neutron-plugin-api'
|
|
||||||
|
|
||||||
- - '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'
|
|
||||||
- 'glance-mysql-router:shared-db'
|
|
||||||
- - 'glance-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - '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'
|
|
||||||
|
|
||||||
- - 'placement:shared-db'
|
|
||||||
- 'placement-mysql-router:shared-db'
|
|
||||||
- - 'placement-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'placement:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'placement:placement'
|
|
||||||
- 'nova-cloud-controller:placement'
|
|
||||||
|
|
||||||
# We need to defer the addition of the neutron-api-plugin-ovn subordinate
|
|
||||||
# relation to the functional test as the test will first validate the legacy
|
|
||||||
# Neutron ML2+OVS topology, migrate it to OVN and then confirm connectivity
|
|
||||||
# post migration.
|
|
||||||
#
|
|
||||||
# - - neutron-api-plugin-ovn:neutron-plugin
|
|
||||||
# - neutron-api:neutron-plugin-api-subordinate
|
|
||||||
- - ovn-central:certificates
|
|
||||||
- vault:certificates
|
|
||||||
- - ovn-central:ovsdb-cms
|
|
||||||
- neutron-api-plugin-ovn:ovsdb-cms
|
|
||||||
- - ovn-chassis:nova-compute
|
|
||||||
- nova-compute:neutron-plugin
|
|
||||||
- - ovn-chassis:certificates
|
|
||||||
- vault:certificates
|
|
||||||
- - ovn-chassis:ovsdb
|
|
||||||
- ovn-central:ovsdb
|
|
||||||
- - ovn-dedicated-chassis:certificates
|
|
||||||
- vault:certificates
|
|
||||||
- - ovn-dedicated-chassis:ovsdb
|
|
||||||
- ovn-central:ovsdb
|
|
||||||
- - vault:certificates
|
|
||||||
- neutron-api-plugin-ovn:certificates
|
|
||||||
- - vault:shared-db
|
|
||||||
- vault-mysql-router:shared-db
|
|
||||||
- - vault-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
|
@ -1,270 +0,0 @@
|
||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin distro
|
|
||||||
|
|
||||||
series: &series hirsute
|
|
||||||
|
|
||||||
machines:
|
|
||||||
0:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
1:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
2:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
3: {}
|
|
||||||
4: {}
|
|
||||||
5: {}
|
|
||||||
6: {}
|
|
||||||
7: {}
|
|
||||||
8:
|
|
||||||
constraints: "mem=4G"
|
|
||||||
9:
|
|
||||||
constraints: "root-disk=20G mem=4G"
|
|
||||||
10:
|
|
||||||
constraints: "root-disk=20G mem=4G"
|
|
||||||
11: {}
|
|
||||||
12: {}
|
|
||||||
13: {}
|
|
||||||
|
|
||||||
# We specify machine placements for these to improve iteration
|
|
||||||
# time, given that machine "0" comes up way before machine "7"
|
|
||||||
applications:
|
|
||||||
|
|
||||||
neutron-api-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
keystone-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
nova-cloud-controller-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
glance-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
placement-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
|
|
||||||
mysql-innodb-cluster:
|
|
||||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
- '1'
|
|
||||||
- '2'
|
|
||||||
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers/neutron-api
|
|
||||||
series: *series
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
manage-neutron-plugin-legacy-mode: true
|
|
||||||
flat-network-providers: physnet1
|
|
||||||
neutron-security-groups: true
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
|
||||||
neutron-gateway:
|
|
||||||
charm: "../../../neutron-gateway"
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
bridge-mappings: physnet1:br-ex
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '7'
|
|
||||||
|
|
||||||
ovn-dedicated-chassis:
|
|
||||||
charm: cs:~openstack-charmers/ovn-dedicated-chassis
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
# start new units paused to allow unit by unit OVS to OVN migration
|
|
||||||
new-units-paused: true
|
|
||||||
to:
|
|
||||||
# NOTE: We deliberately colocate the ovn-dedicated-chassis with the
|
|
||||||
# neutron-gateway for migration test purposes.
|
|
||||||
- '7'
|
|
||||||
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
network-manager: Neutron
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '8'
|
|
||||||
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 2
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '9'
|
|
||||||
- '10'
|
|
||||||
|
|
||||||
placement:
|
|
||||||
charm: cs:~openstack-charmers/placement
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '11'
|
|
||||||
|
|
||||||
vault-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
vault:
|
|
||||||
charm: cs:~openstack-charmers/vault
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '12'
|
|
||||||
ovn-central:
|
|
||||||
charm: cs:~openstack-charmers/ovn-central
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '13'
|
|
||||||
neutron-api-plugin-ovn:
|
|
||||||
charm: cs:~openstack-charmers/neutron-api-plugin-ovn
|
|
||||||
ovn-chassis:
|
|
||||||
charm: cs:~openstack-charmers/ovn-chassis
|
|
||||||
options:
|
|
||||||
# start new units paused to allow unit by unit OVS to OVN migration
|
|
||||||
new-units-paused: true
|
|
||||||
|
|
||||||
relations:
|
|
||||||
|
|
||||||
- - 'neutron-api:shared-db'
|
|
||||||
- 'neutron-api-mysql-router:shared-db'
|
|
||||||
- - 'neutron-api-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'neutron-api:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'neutron-api:neutron-api'
|
|
||||||
- 'nova-cloud-controller:neutron-api'
|
|
||||||
|
|
||||||
- - 'neutron-api:neutron-plugin-api'
|
|
||||||
- 'neutron-gateway:neutron-plugin-api'
|
|
||||||
|
|
||||||
- - 'neutron-api:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'keystone-mysql-router:shared-db'
|
|
||||||
- - 'keystone-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'nova-compute:neutron-plugin'
|
|
||||||
- 'neutron-openvswitch:neutron-plugin'
|
|
||||||
|
|
||||||
- - 'nova-cloud-controller:shared-db'
|
|
||||||
- 'nova-cloud-controller-mysql-router:shared-db'
|
|
||||||
- - 'nova-cloud-controller-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'neutron-gateway:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'nova-cloud-controller:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'nova-compute:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'neutron-openvswitch:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'neutron-openvswitch:neutron-plugin-api'
|
|
||||||
- 'neutron-api:neutron-plugin-api'
|
|
||||||
|
|
||||||
- - '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'
|
|
||||||
- 'glance-mysql-router:shared-db'
|
|
||||||
- - 'glance-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - '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'
|
|
||||||
|
|
||||||
- - 'placement:shared-db'
|
|
||||||
- 'placement-mysql-router:shared-db'
|
|
||||||
- - 'placement-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'placement:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'placement:placement'
|
|
||||||
- 'nova-cloud-controller:placement'
|
|
||||||
|
|
||||||
# We need to defer the addition of the neutron-api-plugin-ovn subordinate
|
|
||||||
# relation to the functional test as the test will first validate the legacy
|
|
||||||
# Neutron ML2+OVS topology, migrate it to OVN and then confirm connectivity
|
|
||||||
# post migration.
|
|
||||||
#
|
|
||||||
# - - neutron-api-plugin-ovn:neutron-plugin
|
|
||||||
# - neutron-api:neutron-plugin-api-subordinate
|
|
||||||
- - ovn-central:certificates
|
|
||||||
- vault:certificates
|
|
||||||
- - ovn-central:ovsdb-cms
|
|
||||||
- neutron-api-plugin-ovn:ovsdb-cms
|
|
||||||
- - ovn-chassis:nova-compute
|
|
||||||
- nova-compute:neutron-plugin
|
|
||||||
- - ovn-chassis:certificates
|
|
||||||
- vault:certificates
|
|
||||||
- - ovn-chassis:ovsdb
|
|
||||||
- ovn-central:ovsdb
|
|
||||||
- - ovn-dedicated-chassis:certificates
|
|
||||||
- vault:certificates
|
|
||||||
- - ovn-dedicated-chassis:ovsdb
|
|
||||||
- ovn-central:ovsdb
|
|
||||||
- - vault:certificates
|
|
||||||
- neutron-api-plugin-ovn:certificates
|
|
||||||
- - vault:shared-db
|
|
||||||
- vault-mysql-router:shared-db
|
|
||||||
- - vault-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
|
@ -1,270 +0,0 @@
|
||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin distro
|
|
||||||
|
|
||||||
series: &series impish
|
|
||||||
|
|
||||||
machines:
|
|
||||||
0:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
1:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
2:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
3: {}
|
|
||||||
4: {}
|
|
||||||
5: {}
|
|
||||||
6: {}
|
|
||||||
7: {}
|
|
||||||
8:
|
|
||||||
constraints: "mem=4G"
|
|
||||||
9:
|
|
||||||
constraints: "root-disk=20G mem=4G"
|
|
||||||
10:
|
|
||||||
constraints: "root-disk=20G mem=4G"
|
|
||||||
11: {}
|
|
||||||
12: {}
|
|
||||||
13: {}
|
|
||||||
|
|
||||||
# We specify machine placements for these to improve iteration
|
|
||||||
# time, given that machine "0" comes up way before machine "7"
|
|
||||||
applications:
|
|
||||||
|
|
||||||
neutron-api-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
keystone-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
nova-cloud-controller-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
glance-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
placement-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
|
|
||||||
mysql-innodb-cluster:
|
|
||||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
- '1'
|
|
||||||
- '2'
|
|
||||||
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers/neutron-api
|
|
||||||
series: *series
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
manage-neutron-plugin-legacy-mode: true
|
|
||||||
flat-network-providers: physnet1
|
|
||||||
neutron-security-groups: true
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
|
||||||
neutron-gateway:
|
|
||||||
charm: "../../../neutron-gateway"
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
bridge-mappings: physnet1:br-ex
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '7'
|
|
||||||
|
|
||||||
ovn-dedicated-chassis:
|
|
||||||
charm: cs:~openstack-charmers/ovn-dedicated-chassis
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
# start new units paused to allow unit by unit OVS to OVN migration
|
|
||||||
new-units-paused: true
|
|
||||||
to:
|
|
||||||
# NOTE: We deliberately colocate the ovn-dedicated-chassis with the
|
|
||||||
# neutron-gateway for migration test purposes.
|
|
||||||
- '7'
|
|
||||||
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
network-manager: Neutron
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '8'
|
|
||||||
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 2
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '9'
|
|
||||||
- '10'
|
|
||||||
|
|
||||||
placement:
|
|
||||||
charm: cs:~openstack-charmers/placement
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '11'
|
|
||||||
|
|
||||||
vault-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
vault:
|
|
||||||
charm: cs:~openstack-charmers/vault
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '12'
|
|
||||||
ovn-central:
|
|
||||||
charm: cs:~openstack-charmers/ovn-central
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '13'
|
|
||||||
neutron-api-plugin-ovn:
|
|
||||||
charm: cs:~openstack-charmers/neutron-api-plugin-ovn
|
|
||||||
ovn-chassis:
|
|
||||||
charm: cs:~openstack-charmers/ovn-chassis
|
|
||||||
options:
|
|
||||||
# start new units paused to allow unit by unit OVS to OVN migration
|
|
||||||
new-units-paused: true
|
|
||||||
|
|
||||||
relations:
|
|
||||||
|
|
||||||
- - 'neutron-api:shared-db'
|
|
||||||
- 'neutron-api-mysql-router:shared-db'
|
|
||||||
- - 'neutron-api-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'neutron-api:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'neutron-api:neutron-api'
|
|
||||||
- 'nova-cloud-controller:neutron-api'
|
|
||||||
|
|
||||||
- - 'neutron-api:neutron-plugin-api'
|
|
||||||
- 'neutron-gateway:neutron-plugin-api'
|
|
||||||
|
|
||||||
- - 'neutron-api:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'keystone-mysql-router:shared-db'
|
|
||||||
- - 'keystone-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'nova-compute:neutron-plugin'
|
|
||||||
- 'neutron-openvswitch:neutron-plugin'
|
|
||||||
|
|
||||||
- - 'nova-cloud-controller:shared-db'
|
|
||||||
- 'nova-cloud-controller-mysql-router:shared-db'
|
|
||||||
- - 'nova-cloud-controller-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'neutron-gateway:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'nova-cloud-controller:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'nova-compute:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'neutron-openvswitch:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'neutron-openvswitch:neutron-plugin-api'
|
|
||||||
- 'neutron-api:neutron-plugin-api'
|
|
||||||
|
|
||||||
- - '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'
|
|
||||||
- 'glance-mysql-router:shared-db'
|
|
||||||
- - 'glance-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - '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'
|
|
||||||
|
|
||||||
- - 'placement:shared-db'
|
|
||||||
- 'placement-mysql-router:shared-db'
|
|
||||||
- - 'placement-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'placement:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'placement:placement'
|
|
||||||
- 'nova-cloud-controller:placement'
|
|
||||||
|
|
||||||
# We need to defer the addition of the neutron-api-plugin-ovn subordinate
|
|
||||||
# relation to the functional test as the test will first validate the legacy
|
|
||||||
# Neutron ML2+OVS topology, migrate it to OVN and then confirm connectivity
|
|
||||||
# post migration.
|
|
||||||
#
|
|
||||||
# - - neutron-api-plugin-ovn:neutron-plugin
|
|
||||||
# - neutron-api:neutron-plugin-api-subordinate
|
|
||||||
- - ovn-central:certificates
|
|
||||||
- vault:certificates
|
|
||||||
- - ovn-central:ovsdb-cms
|
|
||||||
- neutron-api-plugin-ovn:ovsdb-cms
|
|
||||||
- - ovn-chassis:nova-compute
|
|
||||||
- nova-compute:neutron-plugin
|
|
||||||
- - ovn-chassis:certificates
|
|
||||||
- vault:certificates
|
|
||||||
- - ovn-chassis:ovsdb
|
|
||||||
- ovn-central:ovsdb
|
|
||||||
- - ovn-dedicated-chassis:certificates
|
|
||||||
- vault:certificates
|
|
||||||
- - ovn-dedicated-chassis:ovsdb
|
|
||||||
- ovn-central:ovsdb
|
|
||||||
- - vault:certificates
|
|
||||||
- neutron-api-plugin-ovn:certificates
|
|
||||||
- - vault:shared-db
|
|
||||||
- vault-mysql-router:shared-db
|
|
||||||
- - vault-mysql-router:db-router
|
|
||||||
- mysql-innodb-cluster:db-router
|
|
|
@ -1,130 +0,0 @@
|
||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin cloud:trusty-mitaka
|
|
||||||
|
|
||||||
series: &series trusty
|
|
||||||
|
|
||||||
machines:
|
|
||||||
0:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
1: {}
|
|
||||||
2: {}
|
|
||||||
3: {}
|
|
||||||
4: {}
|
|
||||||
5: {}
|
|
||||||
6:
|
|
||||||
constraints: "mem=4G"
|
|
||||||
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:
|
|
||||||
percona-cluster:
|
|
||||||
charm: cs:trusty/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '1'
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers/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/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
|
||||||
neutron-gateway:
|
|
||||||
charm: "../../../neutron-gateway"
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
bridge-mappings: physnet1:br-ex
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
network-manager: Neutron
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 2
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '7'
|
|
||||||
- '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:neutron-plugin-api'
|
|
||||||
- 'neutron-gateway:neutron-plugin-api'
|
|
||||||
- - 'neutron-api:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'nova-compute:neutron-plugin'
|
|
||||||
- 'neutron-openvswitch:neutron-plugin'
|
|
||||||
- - 'nova-cloud-controller:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'neutron-gateway:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-cloud-controller:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-compute:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'neutron-openvswitch:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'neutron-openvswitch:neutron-plugin-api'
|
|
||||||
- 'neutron-api:neutron-plugin-api'
|
|
||||||
- - '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'
|
|
||||||
- - 'nova-cloud-controller:quantum-network-service'
|
|
||||||
- 'neutron-gateway:quantum-network-service'
|
|
|
@ -1,130 +0,0 @@
|
||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin distro
|
|
||||||
|
|
||||||
series: &series xenial
|
|
||||||
|
|
||||||
machines:
|
|
||||||
0:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
1: {}
|
|
||||||
2: {}
|
|
||||||
3: {}
|
|
||||||
4: {}
|
|
||||||
5: {}
|
|
||||||
6:
|
|
||||||
constraints: "mem=4G"
|
|
||||||
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:
|
|
||||||
percona-cluster:
|
|
||||||
charm: cs:~openstack-charmers/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '1'
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers/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/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
|
||||||
neutron-gateway:
|
|
||||||
charm: "../../../neutron-gateway"
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
bridge-mappings: physnet1:br-ex
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
network-manager: Neutron
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 2
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '7'
|
|
||||||
- '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:neutron-plugin-api'
|
|
||||||
- 'neutron-gateway:neutron-plugin-api'
|
|
||||||
- - 'neutron-api:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'nova-compute:neutron-plugin'
|
|
||||||
- 'neutron-openvswitch:neutron-plugin'
|
|
||||||
- - 'nova-cloud-controller:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'neutron-gateway:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-cloud-controller:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-compute:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'neutron-openvswitch:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'neutron-openvswitch:neutron-plugin-api'
|
|
||||||
- 'neutron-api:neutron-plugin-api'
|
|
||||||
- - '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'
|
|
||||||
- - 'nova-cloud-controller:quantum-network-service'
|
|
||||||
- 'neutron-gateway:quantum-network-service'
|
|
|
@ -1,130 +0,0 @@
|
||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin cloud:xenial-ocata
|
|
||||||
|
|
||||||
series: &series xenial
|
|
||||||
|
|
||||||
machines:
|
|
||||||
0:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
1: {}
|
|
||||||
2: {}
|
|
||||||
3: {}
|
|
||||||
4: {}
|
|
||||||
5: {}
|
|
||||||
6:
|
|
||||||
constraints: "mem=4G"
|
|
||||||
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:
|
|
||||||
percona-cluster:
|
|
||||||
charm: cs:~openstack-charmers/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '1'
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers/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/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
|
||||||
neutron-gateway:
|
|
||||||
charm: "../../../neutron-gateway"
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
bridge-mappings: physnet1:br-ex
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
network-manager: Neutron
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 2
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '7'
|
|
||||||
- '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:neutron-plugin-api'
|
|
||||||
- 'neutron-gateway:neutron-plugin-api'
|
|
||||||
- - 'neutron-api:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'nova-compute:neutron-plugin'
|
|
||||||
- 'neutron-openvswitch:neutron-plugin'
|
|
||||||
- - 'nova-cloud-controller:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'neutron-gateway:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-cloud-controller:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-compute:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'neutron-openvswitch:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'neutron-openvswitch:neutron-plugin-api'
|
|
||||||
- 'neutron-api:neutron-plugin-api'
|
|
||||||
- - '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'
|
|
||||||
- - 'nova-cloud-controller:quantum-network-service'
|
|
||||||
- 'neutron-gateway:quantum-network-service'
|
|
|
@ -1,130 +0,0 @@
|
||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin cloud:xenial-pike
|
|
||||||
|
|
||||||
series: &series xenial
|
|
||||||
|
|
||||||
machines:
|
|
||||||
0:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
1: {}
|
|
||||||
2: {}
|
|
||||||
3: {}
|
|
||||||
4: {}
|
|
||||||
5: {}
|
|
||||||
6:
|
|
||||||
constraints: "mem=4G"
|
|
||||||
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:
|
|
||||||
percona-cluster:
|
|
||||||
charm: cs:~openstack-charmers/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '1'
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers/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/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
|
||||||
neutron-gateway:
|
|
||||||
charm: "../../../neutron-gateway"
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
bridge-mappings: physnet1:br-ex
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
network-manager: Neutron
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 2
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '7'
|
|
||||||
- '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:neutron-plugin-api'
|
|
||||||
- 'neutron-gateway:neutron-plugin-api'
|
|
||||||
- - 'neutron-api:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'nova-compute:neutron-plugin'
|
|
||||||
- 'neutron-openvswitch:neutron-plugin'
|
|
||||||
- - 'nova-cloud-controller:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'neutron-gateway:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-cloud-controller:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-compute:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'neutron-openvswitch:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'neutron-openvswitch:neutron-plugin-api'
|
|
||||||
- 'neutron-api:neutron-plugin-api'
|
|
||||||
- - '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'
|
|
||||||
- - 'nova-cloud-controller:quantum-network-service'
|
|
||||||
- 'neutron-gateway:quantum-network-service'
|
|
|
@ -1,130 +0,0 @@
|
||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin cloud:xenial-queens
|
|
||||||
|
|
||||||
series: &series xenial
|
|
||||||
|
|
||||||
machines:
|
|
||||||
0:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
1: {}
|
|
||||||
2: {}
|
|
||||||
3: {}
|
|
||||||
4: {}
|
|
||||||
5: {}
|
|
||||||
6:
|
|
||||||
constraints: "mem=4G"
|
|
||||||
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:
|
|
||||||
percona-cluster:
|
|
||||||
charm: cs:~openstack-charmers/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '1'
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers/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/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
neutron-openvswitch:
|
|
||||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
|
||||||
neutron-gateway:
|
|
||||||
charm: "../../../neutron-gateway"
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
bridge-mappings: physnet1:br-ex
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
nova-cloud-controller:
|
|
||||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
network-manager: Neutron
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 2
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '7'
|
|
||||||
- '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:neutron-plugin-api'
|
|
||||||
- 'neutron-gateway:neutron-plugin-api'
|
|
||||||
- - 'neutron-api:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'nova-compute:neutron-plugin'
|
|
||||||
- 'neutron-openvswitch:neutron-plugin'
|
|
||||||
- - 'nova-cloud-controller:shared-db'
|
|
||||||
- 'percona-cluster:shared-db'
|
|
||||||
- - 'neutron-gateway:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-cloud-controller:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'nova-compute:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'neutron-openvswitch:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
- - 'neutron-openvswitch:neutron-plugin-api'
|
|
||||||
- 'neutron-api:neutron-plugin-api'
|
|
||||||
- - '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'
|
|
||||||
- - 'nova-cloud-controller:quantum-network-service'
|
|
||||||
- 'neutron-gateway:quantum-network-service'
|
|
|
@ -6,28 +6,13 @@ charm_name: neutron-gateway
|
||||||
# OVS to OVN.
|
# OVS to OVN.
|
||||||
#
|
#
|
||||||
smoke_bundles:
|
smoke_bundles:
|
||||||
- migrate-ovn: focal-ussuri
|
- migrate-ovn: focal-wallaby
|
||||||
|
|
||||||
gate_bundles:
|
gate_bundles:
|
||||||
- migrate-ovn: groovy-victoria
|
|
||||||
- migrate-ovn: focal-wallaby
|
- migrate-ovn: focal-wallaby
|
||||||
- migrate-ovn: focal-victoria
|
- migrate-ovn: focal-victoria
|
||||||
- migrate-ovn: focal-ussuri
|
|
||||||
- bionic-ussuri
|
|
||||||
- bionic-train
|
|
||||||
- bionic-stein
|
|
||||||
- bionic-queens
|
|
||||||
- xenial-mitaka
|
|
||||||
|
|
||||||
dev_bundles:
|
dev_bundles: []
|
||||||
- trusty-mitaka
|
|
||||||
- xenial-ocata
|
|
||||||
- xenial-pike
|
|
||||||
- xenial-queens
|
|
||||||
- bionic-rocky
|
|
||||||
- migrate-ovn: focal-xena
|
|
||||||
- migrate-ovn: hirsute-wallaby
|
|
||||||
- migrate-ovn: impish-xena
|
|
||||||
|
|
||||||
target_deploy_status:
|
target_deploy_status:
|
||||||
neutron-api-plugin-ovn:
|
neutron-api-plugin-ovn:
|
||||||
|
@ -91,6 +76,4 @@ tests_options:
|
||||||
# reusing the instances created for the first run. This both saves time and
|
# reusing the instances created for the first run. This both saves time and
|
||||||
# allows verifying instances survive a SDN migration.
|
# allows verifying instances survive a SDN migration.
|
||||||
zaza.openstack.charm_tests.neutron.tests.NeutronNetworkingTest.test_instances_have_networking.run_resource_cleanup: false
|
zaza.openstack.charm_tests.neutron.tests.NeutronNetworkingTest.test_instances_have_networking.run_resource_cleanup: false
|
||||||
force_deploy:
|
force_deploy: []
|
||||||
- groovy-victoria
|
|
||||||
- impish-xena
|
|
||||||
|
|
34
tox.ini
34
tox.ini
|
@ -37,12 +37,22 @@ setenv = VIRTUAL_ENV={envdir}
|
||||||
install_command =
|
install_command =
|
||||||
{toxinidir}/pip.sh install {opts} {packages}
|
{toxinidir}/pip.sh install {opts} {packages}
|
||||||
commands = stestr run --slowest {posargs}
|
commands = stestr run --slowest {posargs}
|
||||||
allowlist_externals = juju
|
allowlist_externals =
|
||||||
|
charmcraft
|
||||||
|
rename.sh
|
||||||
passenv = HOME TERM CS_* OS_* TEST_*
|
passenv = HOME TERM CS_* OS_* TEST_*
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
|
|
||||||
[testenv:py35]
|
[testenv:build]
|
||||||
basepython = python3.5
|
basepython = python3
|
||||||
|
deps = -r{toxinidir}/build-requirements.txt
|
||||||
|
commands =
|
||||||
|
charmcraft clean
|
||||||
|
charmcraft -v build
|
||||||
|
{toxinidir}/rename.sh
|
||||||
|
|
||||||
|
[testenv:py3]
|
||||||
|
basepython = python3
|
||||||
deps = -r{toxinidir}/requirements.txt
|
deps = -r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
|
|
||||||
|
@ -50,21 +60,25 @@ deps = -r{toxinidir}/requirements.txt
|
||||||
basepython = python3.6
|
basepython = python3.6
|
||||||
deps = -r{toxinidir}/requirements.txt
|
deps = -r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
|
commands = stestr run --slowest {posargs}
|
||||||
[testenv:py37]
|
|
||||||
basepython = python3.7
|
|
||||||
deps = -r{toxinidir}/requirements.txt
|
|
||||||
-r{toxinidir}/test-requirements.txt
|
|
||||||
|
|
||||||
[testenv:py38]
|
[testenv:py38]
|
||||||
basepython = python3.8
|
basepython = python3.8
|
||||||
deps = -r{toxinidir}/requirements.txt
|
deps = -r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
|
commands = stestr run --slowest {posargs}
|
||||||
|
|
||||||
[testenv:py3]
|
[testenv:py39]
|
||||||
basepython = python3
|
basepython = python3.9
|
||||||
deps = -r{toxinidir}/requirements.txt
|
deps = -r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
|
commands = stestr run --slowest {posargs}
|
||||||
|
|
||||||
|
[testenv:py310]
|
||||||
|
basepython = python3.10
|
||||||
|
deps = -r{toxinidir}/requirements.txt
|
||||||
|
-r{toxinidir}/test-requirements.txt
|
||||||
|
commands = stestr run --slowest {posargs}
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
|
|
Loading…
Reference in New Issue