openstack/charm-neutron-openvswitch
Code Issues Proposed changes

Updates for stable branch creation

Browse Source 
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.

Change-Id: I874c1655321ac82678c31afa6da0441994a3560f
This commit is contained in:
David Ames
2020-05-21 09:58:11 -07:00
parent d5009161f0
commit 31ea2a9980
13 changed files with 92 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitreview
View File

@@ -2,3 +2,5 @@
host=review.opendev.org
port=29418
project=openstack/charm-neutron-openvswitch.git
defaultbranch=stable/20.05

2
charm-helpers-hooks.yaml
View File

@@ -1,4 +1,4 @@
repo: https://github.com/juju/charm-helpers
repo: https://github.com/juju/charm-helpers@stable/20.05
destination: hooks/charmhelpers
include:
- core

14
tests/bundles/bionic-queens-dvr-snat.yaml
View File

@@ -20,21 +20,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:
@@ -47,14 +47,14 @@ 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
@@ -67,7 +67,7 @@ applications:
bridge-mappings: physnet1:br-ex
enable-local-dhcp-and-metadata: True
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
@@ -75,7 +75,7 @@ applications:
to:
- '5'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
options:
config-flags: default_ephemeral_format=ext4

14
tests/bundles/bionic-rocky-dvr-snat.yaml
View File

@@ -20,21 +20,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:
@@ -47,14 +47,14 @@ 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
@@ -67,7 +67,7 @@ applications:
bridge-mappings: physnet1:br-ex
enable-local-dhcp-and-metadata: True
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
@@ -75,7 +75,7 @@ applications:
to:
- '5'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
options:
config-flags: default_ephemeral_format=ext4

14
tests/bundles/bionic-stein-dvr-snat.yaml
View File

@@ -20,21 +20,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:
@@ -47,14 +47,14 @@ 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
@@ -67,7 +67,7 @@ applications:
bridge-mappings: physnet1:br-ex
enable-local-dhcp-and-metadata: True
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
@@ -75,7 +75,7 @@ applications:
to:
- '5'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
options:
config-flags: default_ephemeral_format=ext4

16
tests/bundles/bionic-train-dvr-snat.yaml
View File

@@ -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:
@@ -48,14 +48,14 @@ 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
@@ -68,7 +68,7 @@ applications:
bridge-mappings: physnet1:br-ex
enable-local-dhcp-and-metadata: True
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
@@ -76,7 +76,7 @@ applications:
to:
- '5'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
options:
config-flags: default_ephemeral_format=ext4
@@ -88,7 +88,7 @@ applications:
- '6'
- '7'
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *openstack-origin

16
tests/bundles/bionic-ussuri-dvr-snat.yaml
View File

@@ -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:
@@ -49,14 +49,14 @@ 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
@@ -69,7 +69,7 @@ applications:
bridge-mappings: physnet1:br-ex
enable-local-dhcp-and-metadata: True
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:
- '5'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
options:
config-flags: default_ephemeral_format=ext4
@@ -89,7 +89,7 @@ applications:
- '6'
- '7'
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *openstack-origin

28
tests/bundles/focal-ussuri-dvr-snat.yaml
View File

@@ -25,19 +25,19 @@ machines:
# time, given that machine "0" comes up way before machine "7"
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
nova-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
neutron-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
vault-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
@@ -46,14 +46,14 @@ applications:
- '1'
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
series: *series
num_units: 1
options:
@@ -67,14 +67,14 @@ applications:
to:
- '4'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '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:
bridge-mappings: physnet1:br-ex
enable-local-dhcp-and-metadata: True
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
@@ -95,7 +95,7 @@ applications:
to:
- '7'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
options:
config-flags: default_ephemeral_format=ext4
@@ -107,7 +107,7 @@ applications:
- '8'
- '9'
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *openstack-origin

14
tests/bundles/trusty-mitaka.yaml
View File

@@ -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,14 +45,14 @@ 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
@@ -61,7 +61,7 @@ applications:
neutron-openvswitch:
charm: ../../../neutron-openvswitch
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
@@ -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:
config-flags: default_ephemeral_format=ext4

16
tests/bundles/xenial-mitaka.yaml
View File

@@ -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,14 +45,14 @@ 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
@@ -61,7 +61,7 @@ applications:
neutron-openvswitch:
charm: ../../../neutron-openvswitch
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
@@ -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:
config-flags: default_ephemeral_format=ext4

16
tests/bundles/xenial-ocata.yaml
View File

@@ -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,14 +45,14 @@ 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
@@ -61,7 +61,7 @@ applications:
neutron-openvswitch:
charm: ../../../neutron-openvswitch
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
@@ -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:
config-flags: default_ephemeral_format=ext4

16
tests/bundles/xenial-pike.yaml
View File

@@ -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,14 +45,14 @@ 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
@@ -61,7 +61,7 @@ applications:
neutron-openvswitch:
charm: ../../../neutron-openvswitch
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
@@ -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:
config-flags: default_ephemeral_format=ext4

14
tests/bundles/xenial-queens-dvr-snat.yaml
View File

@@ -20,21 +20,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:
@@ -47,14 +47,14 @@ 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
@@ -67,7 +67,7 @@ applications:
bridge-mappings: physnet1:br-ex
enable-local-dhcp-and-metadata: True
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
@@ -75,7 +75,7 @@ applications:
to:
- '5'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
options:
config-flags: default_ephemeral_format=ext4