Updates for stable branch creation 21.01
Set default branch for git review/gerrit. Switch tests to stable. Switch to using stable charm-helpers branch. Switch to using stable charm.openstack branch. Switch to using stable zaza branch. Switch to using stable zaza-openstack-tests branch. Change-Id: Icce5939cc2dc825a42686dee8d61914c18dcde74
This commit is contained in:
parent
75fccfb230
commit
3cc5b2120a
|
@ -2,3 +2,5 @@
|
|||
host=review.opendev.org
|
||||
port=29418
|
||||
project=openstack/charm-neutron-gateway.git
|
||||
|
||||
defaultbranch=stable/21.01
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
repo: https://github.com/juju/charm-helpers
|
||||
repo: https://github.com/juju/charm-helpers@stable/21.01
|
||||
destination: hooks/charmhelpers
|
||||
include:
|
||||
- core
|
||||
|
|
|
@ -42,8 +42,8 @@ oslo.utils<=3.41.0;python_version<'3.6'
|
|||
|
||||
coverage>=4.5.2
|
||||
pyudev # for ceph-* charm unit tests (need to fix the ceph-* charm unit tests/mocking)
|
||||
git+https://github.com/openstack-charmers/zaza.git#egg=zaza;python_version>='3.0'
|
||||
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
|
||||
git+https://github.com/openstack-charmers/zaza.git@stable/21.01#egg=zaza;python_version>='3.0'
|
||||
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.01#egg=zaza.openstack
|
||||
|
||||
# Needed for charm-glance:
|
||||
git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.6'
|
||||
|
|
|
@ -21,21 +21,21 @@ machines:
|
|||
# time, given that machine "0" comes up way before machine "7"
|
||||
applications:
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '1'
|
||||
neutron-api:
|
||||
charm: cs:~openstack-charmers-next/neutron-api
|
||||
charm: cs:~openstack-charmers/neutron-api
|
||||
series: *series
|
||||
num_units: 1
|
||||
options:
|
||||
|
@ -45,21 +45,21 @@ applications:
|
|||
to:
|
||||
- '2'
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
neutron-openvswitch:
|
||||
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
||||
neutron-gateway:
|
||||
charm: "../../../neutron-gateway"
|
||||
num_units: 1
|
||||
|
@ -69,7 +69,7 @@ applications:
|
|||
to:
|
||||
- '5'
|
||||
nova-cloud-controller:
|
||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
||||
num_units: 1
|
||||
options:
|
||||
network-manager: Neutron
|
||||
|
@ -77,7 +77,7 @@ applications:
|
|||
to:
|
||||
- '6'
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers-next/nova-compute
|
||||
charm: cs:~openstack-charmers/nova-compute
|
||||
num_units: 2
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
|
|
@ -21,21 +21,21 @@ machines:
|
|||
# time, given that machine "0" comes up way before machine "7"
|
||||
applications:
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '1'
|
||||
neutron-api:
|
||||
charm: cs:~openstack-charmers-next/neutron-api
|
||||
charm: cs:~openstack-charmers/neutron-api
|
||||
series: *series
|
||||
num_units: 1
|
||||
options:
|
||||
|
@ -45,21 +45,21 @@ applications:
|
|||
to:
|
||||
- '2'
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
neutron-openvswitch:
|
||||
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
||||
neutron-gateway:
|
||||
charm: "../../../neutron-gateway"
|
||||
num_units: 1
|
||||
|
@ -69,7 +69,7 @@ applications:
|
|||
to:
|
||||
- '5'
|
||||
nova-cloud-controller:
|
||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
||||
num_units: 1
|
||||
options:
|
||||
network-manager: Neutron
|
||||
|
@ -77,7 +77,7 @@ applications:
|
|||
to:
|
||||
- '6'
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers-next/nova-compute
|
||||
charm: cs:~openstack-charmers/nova-compute
|
||||
num_units: 2
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
|
|
@ -21,21 +21,21 @@ machines:
|
|||
# time, given that machine "0" comes up way before machine "7"
|
||||
applications:
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '1'
|
||||
neutron-api:
|
||||
charm: cs:~openstack-charmers-next/neutron-api
|
||||
charm: cs:~openstack-charmers/neutron-api
|
||||
series: *series
|
||||
num_units: 1
|
||||
options:
|
||||
|
@ -45,21 +45,21 @@ applications:
|
|||
to:
|
||||
- '2'
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
neutron-openvswitch:
|
||||
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
||||
neutron-gateway:
|
||||
charm: "../../../neutron-gateway"
|
||||
num_units: 1
|
||||
|
@ -69,7 +69,7 @@ applications:
|
|||
to:
|
||||
- '5'
|
||||
nova-cloud-controller:
|
||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
||||
num_units: 1
|
||||
options:
|
||||
network-manager: Neutron
|
||||
|
@ -77,7 +77,7 @@ applications:
|
|||
to:
|
||||
- '6'
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers-next/nova-compute
|
||||
charm: cs:~openstack-charmers/nova-compute
|
||||
num_units: 2
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
|
|
@ -21,21 +21,21 @@ machines:
|
|||
# time, given that machine "0" comes up way before machine "7"
|
||||
applications:
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '1'
|
||||
neutron-api:
|
||||
charm: cs:~openstack-charmers-next/neutron-api
|
||||
charm: cs:~openstack-charmers/neutron-api
|
||||
series: *series
|
||||
num_units: 1
|
||||
options:
|
||||
|
@ -45,21 +45,21 @@ applications:
|
|||
to:
|
||||
- '2'
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
neutron-openvswitch:
|
||||
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
||||
neutron-gateway:
|
||||
charm: "../../../neutron-gateway"
|
||||
num_units: 1
|
||||
|
@ -69,7 +69,7 @@ applications:
|
|||
to:
|
||||
- '5'
|
||||
nova-cloud-controller:
|
||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
||||
num_units: 1
|
||||
options:
|
||||
network-manager: Neutron
|
||||
|
@ -77,7 +77,7 @@ applications:
|
|||
to:
|
||||
- '6'
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers-next/nova-compute
|
||||
charm: cs:~openstack-charmers/nova-compute
|
||||
num_units: 2
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
@ -85,7 +85,7 @@ applications:
|
|||
- '7'
|
||||
- '8'
|
||||
placement:
|
||||
charm: cs:~openstack-charmers-next/placement
|
||||
charm: cs:~openstack-charmers/placement
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
|
|
@ -21,21 +21,21 @@ machines:
|
|||
# time, given that machine "0" comes up way before machine "7"
|
||||
applications:
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '1'
|
||||
neutron-api:
|
||||
charm: cs:~openstack-charmers-next/neutron-api
|
||||
charm: cs:~openstack-charmers/neutron-api
|
||||
series: *series
|
||||
num_units: 1
|
||||
options:
|
||||
|
@ -46,21 +46,21 @@ applications:
|
|||
to:
|
||||
- '2'
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
neutron-openvswitch:
|
||||
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
||||
neutron-gateway:
|
||||
charm: "../../../neutron-gateway"
|
||||
num_units: 1
|
||||
|
@ -70,7 +70,7 @@ applications:
|
|||
to:
|
||||
- '5'
|
||||
nova-cloud-controller:
|
||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
||||
num_units: 1
|
||||
options:
|
||||
network-manager: Neutron
|
||||
|
@ -78,7 +78,7 @@ applications:
|
|||
to:
|
||||
- '6'
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers-next/nova-compute
|
||||
charm: cs:~openstack-charmers/nova-compute
|
||||
num_units: 2
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
@ -86,7 +86,7 @@ applications:
|
|||
- '7'
|
||||
- '8'
|
||||
placement:
|
||||
charm: cs:~openstack-charmers-next/placement
|
||||
charm: cs:~openstack-charmers/placement
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
|
|
@ -29,18 +29,18 @@ machines:
|
|||
applications:
|
||||
|
||||
neutron-api-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
nova-cloud-controller-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
glance-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
placement-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
|
||||
mysql-innodb-cluster:
|
||||
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
|
||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
|
@ -50,7 +50,7 @@ applications:
|
|||
- '2'
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
options:
|
||||
|
@ -59,7 +59,7 @@ applications:
|
|||
- '3'
|
||||
|
||||
neutron-api:
|
||||
charm: cs:~openstack-charmers-next/neutron-api
|
||||
charm: cs:~openstack-charmers/neutron-api
|
||||
series: *series
|
||||
num_units: 1
|
||||
options:
|
||||
|
@ -71,7 +71,7 @@ applications:
|
|||
- '4'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
@ -79,7 +79,7 @@ applications:
|
|||
- '5'
|
||||
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
@ -87,7 +87,7 @@ applications:
|
|||
- '6'
|
||||
|
||||
neutron-openvswitch:
|
||||
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
||||
neutron-gateway:
|
||||
charm: "../../../neutron-gateway"
|
||||
num_units: 1
|
||||
|
@ -98,7 +98,7 @@ applications:
|
|||
- '7'
|
||||
|
||||
ovn-dedicated-chassis:
|
||||
charm: cs:~openstack-charmers-next/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
|
||||
|
@ -109,7 +109,7 @@ applications:
|
|||
- '7'
|
||||
|
||||
nova-cloud-controller:
|
||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
||||
num_units: 1
|
||||
options:
|
||||
network-manager: Neutron
|
||||
|
@ -118,7 +118,7 @@ applications:
|
|||
- '8'
|
||||
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers-next/nova-compute
|
||||
charm: cs:~openstack-charmers/nova-compute
|
||||
num_units: 2
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
@ -127,7 +127,7 @@ applications:
|
|||
- '10'
|
||||
|
||||
placement:
|
||||
charm: cs:~openstack-charmers-next/placement
|
||||
charm: cs:~openstack-charmers/placement
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
@ -135,23 +135,23 @@ applications:
|
|||
- '11'
|
||||
|
||||
vault-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
vault:
|
||||
charm: cs:~openstack-charmers-next/vault
|
||||
charm: cs:~openstack-charmers/vault
|
||||
num_units: 1
|
||||
to:
|
||||
- '12'
|
||||
ovn-central:
|
||||
charm: cs:~openstack-charmers-next/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-next/neutron-api-plugin-ovn
|
||||
charm: cs:~openstack-charmers/neutron-api-plugin-ovn
|
||||
ovn-chassis:
|
||||
charm: cs:~openstack-charmers-next/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
|
||||
|
|
|
@ -29,18 +29,18 @@ machines:
|
|||
applications:
|
||||
|
||||
neutron-api-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
nova-cloud-controller-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
glance-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
placement-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
|
||||
mysql-innodb-cluster:
|
||||
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
|
||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
|
@ -50,7 +50,7 @@ applications:
|
|||
- '2'
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
options:
|
||||
|
@ -59,7 +59,7 @@ applications:
|
|||
- '3'
|
||||
|
||||
neutron-api:
|
||||
charm: cs:~openstack-charmers-next/neutron-api
|
||||
charm: cs:~openstack-charmers/neutron-api
|
||||
series: *series
|
||||
num_units: 1
|
||||
options:
|
||||
|
@ -71,7 +71,7 @@ applications:
|
|||
- '4'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
@ -79,7 +79,7 @@ applications:
|
|||
- '5'
|
||||
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
@ -87,7 +87,7 @@ applications:
|
|||
- '6'
|
||||
|
||||
neutron-openvswitch:
|
||||
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
||||
neutron-gateway:
|
||||
charm: "../../../neutron-gateway"
|
||||
num_units: 1
|
||||
|
@ -98,7 +98,7 @@ applications:
|
|||
- '7'
|
||||
|
||||
ovn-dedicated-chassis:
|
||||
charm: cs:~openstack-charmers-next/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
|
||||
|
@ -109,7 +109,7 @@ applications:
|
|||
- '7'
|
||||
|
||||
nova-cloud-controller:
|
||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
||||
num_units: 1
|
||||
options:
|
||||
network-manager: Neutron
|
||||
|
@ -118,7 +118,7 @@ applications:
|
|||
- '8'
|
||||
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers-next/nova-compute
|
||||
charm: cs:~openstack-charmers/nova-compute
|
||||
num_units: 2
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
@ -127,7 +127,7 @@ applications:
|
|||
- '10'
|
||||
|
||||
placement:
|
||||
charm: cs:~openstack-charmers-next/placement
|
||||
charm: cs:~openstack-charmers/placement
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
@ -135,23 +135,23 @@ applications:
|
|||
- '11'
|
||||
|
||||
vault-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
vault:
|
||||
charm: cs:~openstack-charmers-next/vault
|
||||
charm: cs:~openstack-charmers/vault
|
||||
num_units: 1
|
||||
to:
|
||||
- '12'
|
||||
ovn-central:
|
||||
charm: cs:~openstack-charmers-next/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-next/neutron-api-plugin-ovn
|
||||
charm: cs:~openstack-charmers/neutron-api-plugin-ovn
|
||||
ovn-chassis:
|
||||
charm: cs:~openstack-charmers-next/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
|
||||
|
|
|
@ -29,18 +29,18 @@ machines:
|
|||
applications:
|
||||
|
||||
neutron-api-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
nova-cloud-controller-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
glance-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
placement-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
|
||||
mysql-innodb-cluster:
|
||||
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
|
||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
|
@ -50,7 +50,7 @@ applications:
|
|||
- '2'
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
options:
|
||||
|
@ -59,7 +59,7 @@ applications:
|
|||
- '3'
|
||||
|
||||
neutron-api:
|
||||
charm: cs:~openstack-charmers-next/neutron-api
|
||||
charm: cs:~openstack-charmers/neutron-api
|
||||
series: *series
|
||||
num_units: 1
|
||||
options:
|
||||
|
@ -71,7 +71,7 @@ applications:
|
|||
- '4'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
@ -79,7 +79,7 @@ applications:
|
|||
- '5'
|
||||
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
@ -87,7 +87,7 @@ applications:
|
|||
- '6'
|
||||
|
||||
neutron-openvswitch:
|
||||
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
||||
neutron-gateway:
|
||||
charm: "../../../neutron-gateway"
|
||||
num_units: 1
|
||||
|
@ -98,7 +98,7 @@ applications:
|
|||
- '7'
|
||||
|
||||
ovn-dedicated-chassis:
|
||||
charm: cs:~openstack-charmers-next/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
|
||||
|
@ -109,7 +109,7 @@ applications:
|
|||
- '7'
|
||||
|
||||
nova-cloud-controller:
|
||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
||||
num_units: 1
|
||||
options:
|
||||
network-manager: Neutron
|
||||
|
@ -118,7 +118,7 @@ applications:
|
|||
- '8'
|
||||
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers-next/nova-compute
|
||||
charm: cs:~openstack-charmers/nova-compute
|
||||
num_units: 2
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
@ -127,7 +127,7 @@ applications:
|
|||
- '10'
|
||||
|
||||
placement:
|
||||
charm: cs:~openstack-charmers-next/placement
|
||||
charm: cs:~openstack-charmers/placement
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
@ -135,23 +135,23 @@ applications:
|
|||
- '11'
|
||||
|
||||
vault-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
vault:
|
||||
charm: cs:~openstack-charmers-next/vault
|
||||
charm: cs:~openstack-charmers/vault
|
||||
num_units: 1
|
||||
to:
|
||||
- '12'
|
||||
ovn-central:
|
||||
charm: cs:~openstack-charmers-next/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-next/neutron-api-plugin-ovn
|
||||
charm: cs:~openstack-charmers/neutron-api-plugin-ovn
|
||||
ovn-chassis:
|
||||
charm: cs:~openstack-charmers-next/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
|
||||
|
|
|
@ -28,14 +28,14 @@ applications:
|
|||
to:
|
||||
- '0'
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '1'
|
||||
neutron-api:
|
||||
charm: cs:~openstack-charmers-next/neutron-api
|
||||
charm: cs:~openstack-charmers/neutron-api
|
||||
series: *series
|
||||
num_units: 1
|
||||
options:
|
||||
|
@ -45,21 +45,21 @@ applications:
|
|||
to:
|
||||
- '2'
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
neutron-openvswitch:
|
||||
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
||||
neutron-gateway:
|
||||
charm: "../../../neutron-gateway"
|
||||
num_units: 1
|
||||
|
@ -69,7 +69,7 @@ applications:
|
|||
to:
|
||||
- '5'
|
||||
nova-cloud-controller:
|
||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
||||
num_units: 1
|
||||
options:
|
||||
network-manager: Neutron
|
||||
|
@ -77,7 +77,7 @@ applications:
|
|||
to:
|
||||
- '6'
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers-next/nova-compute
|
||||
charm: cs:~openstack-charmers/nova-compute
|
||||
num_units: 2
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
|
|
@ -21,21 +21,21 @@ machines:
|
|||
# time, given that machine "0" comes up way before machine "7"
|
||||
applications:
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '1'
|
||||
neutron-api:
|
||||
charm: cs:~openstack-charmers-next/neutron-api
|
||||
charm: cs:~openstack-charmers/neutron-api
|
||||
series: *series
|
||||
num_units: 1
|
||||
options:
|
||||
|
@ -45,21 +45,21 @@ applications:
|
|||
to:
|
||||
- '2'
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
neutron-openvswitch:
|
||||
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
||||
neutron-gateway:
|
||||
charm: "../../../neutron-gateway"
|
||||
num_units: 1
|
||||
|
@ -69,7 +69,7 @@ applications:
|
|||
to:
|
||||
- '5'
|
||||
nova-cloud-controller:
|
||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
||||
num_units: 1
|
||||
options:
|
||||
network-manager: Neutron
|
||||
|
@ -77,7 +77,7 @@ applications:
|
|||
to:
|
||||
- '6'
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers-next/nova-compute
|
||||
charm: cs:~openstack-charmers/nova-compute
|
||||
num_units: 2
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
|
|
@ -21,21 +21,21 @@ machines:
|
|||
# time, given that machine "0" comes up way before machine "7"
|
||||
applications:
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '1'
|
||||
neutron-api:
|
||||
charm: cs:~openstack-charmers-next/neutron-api
|
||||
charm: cs:~openstack-charmers/neutron-api
|
||||
series: *series
|
||||
num_units: 1
|
||||
options:
|
||||
|
@ -45,21 +45,21 @@ applications:
|
|||
to:
|
||||
- '2'
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
neutron-openvswitch:
|
||||
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
||||
neutron-gateway:
|
||||
charm: "../../../neutron-gateway"
|
||||
num_units: 1
|
||||
|
@ -69,7 +69,7 @@ applications:
|
|||
to:
|
||||
- '5'
|
||||
nova-cloud-controller:
|
||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
||||
num_units: 1
|
||||
options:
|
||||
network-manager: Neutron
|
||||
|
@ -77,7 +77,7 @@ applications:
|
|||
to:
|
||||
- '6'
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers-next/nova-compute
|
||||
charm: cs:~openstack-charmers/nova-compute
|
||||
num_units: 2
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
|
|
@ -21,21 +21,21 @@ machines:
|
|||
# time, given that machine "0" comes up way before machine "7"
|
||||
applications:
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '1'
|
||||
neutron-api:
|
||||
charm: cs:~openstack-charmers-next/neutron-api
|
||||
charm: cs:~openstack-charmers/neutron-api
|
||||
series: *series
|
||||
num_units: 1
|
||||
options:
|
||||
|
@ -45,21 +45,21 @@ applications:
|
|||
to:
|
||||
- '2'
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
neutron-openvswitch:
|
||||
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
||||
neutron-gateway:
|
||||
charm: "../../../neutron-gateway"
|
||||
num_units: 1
|
||||
|
@ -69,7 +69,7 @@ applications:
|
|||
to:
|
||||
- '5'
|
||||
nova-cloud-controller:
|
||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
||||
num_units: 1
|
||||
options:
|
||||
network-manager: Neutron
|
||||
|
@ -77,7 +77,7 @@ applications:
|
|||
to:
|
||||
- '6'
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers-next/nova-compute
|
||||
charm: cs:~openstack-charmers/nova-compute
|
||||
num_units: 2
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
|
|
@ -21,21 +21,21 @@ machines:
|
|||
# time, given that machine "0" comes up way before machine "7"
|
||||
applications:
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '1'
|
||||
neutron-api:
|
||||
charm: cs:~openstack-charmers-next/neutron-api
|
||||
charm: cs:~openstack-charmers/neutron-api
|
||||
series: *series
|
||||
num_units: 1
|
||||
options:
|
||||
|
@ -45,21 +45,21 @@ applications:
|
|||
to:
|
||||
- '2'
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
neutron-openvswitch:
|
||||
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
||||
neutron-gateway:
|
||||
charm: "../../../neutron-gateway"
|
||||
num_units: 1
|
||||
|
@ -69,7 +69,7 @@ applications:
|
|||
to:
|
||||
- '5'
|
||||
nova-cloud-controller:
|
||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
||||
num_units: 1
|
||||
options:
|
||||
network-manager: Neutron
|
||||
|
@ -77,7 +77,7 @@ applications:
|
|||
to:
|
||||
- '6'
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers-next/nova-compute
|
||||
charm: cs:~openstack-charmers/nova-compute
|
||||
num_units: 2
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
|
Loading…
Reference in New Issue