openstack
/
charm-neutron-api
Code Issues Proposed changes

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: I300be50bd8952ac630b0b0a8056ab2469da43a8b
This commit is contained in:
Aurelien Lourot 2021-02-10 20:12:58 +01:00
parent d4e4eeb743
commit 02eb3abade
16 changed files with 52 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitreview
View File

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

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/21.01
destination: hooks/charmhelpers destination: hooks/charmhelpers
include: include:
- core - core

4
test-requirements.txt
View File

@ -42,8 +42,8 @@ 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#egg=zaza;python_version>='3.0' 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#egg=zaza.openstack git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.01#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.6'

6
tests/bundles/bionic-queens.yaml
View File

@ -6,12 +6,12 @@ series: &series bionic
applications: applications:
percona-cluster: percona-cluster:
constraints: mem=3072M constraints: mem=3072M
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
options: options:
source: *openstack-origin source: *openstack-origin
rabbitmq-server: rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1 num_units: 1
options: options:
source: *openstack-origin source: *openstack-origin
@ -24,7 +24,7 @@ applications:
neutron-security-groups: true neutron-security-groups: true
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
keystone: keystone:
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin

6
tests/bundles/bionic-rocky.yaml
View File

@ -6,12 +6,12 @@ series: &series bionic
applications: applications:
percona-cluster: percona-cluster:
constraints: mem=3072M constraints: mem=3072M
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
options: options:
source: *openstack-origin source: *openstack-origin
rabbitmq-server: rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1 num_units: 1
options: options:
source: *openstack-origin source: *openstack-origin
@ -24,7 +24,7 @@ applications:
neutron-security-groups: true neutron-security-groups: true
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
keystone: keystone:
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin

6
tests/bundles/bionic-stein.yaml
View File

@ -6,12 +6,12 @@ series: &series bionic
applications: applications:
percona-cluster: percona-cluster:
constraints: mem=3072M constraints: mem=3072M
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
options: options:
source: *openstack-origin source: *openstack-origin
rabbitmq-server: rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1 num_units: 1
options: options:
source: *openstack-origin source: *openstack-origin
@ -24,7 +24,7 @@ applications:
neutron-security-groups: true neutron-security-groups: true
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
keystone: keystone:
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin

6
tests/bundles/bionic-train.yaml
View File

@ -6,12 +6,12 @@ series: &series bionic
applications: applications:
percona-cluster: percona-cluster:
constraints: mem=3072M constraints: mem=3072M
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
options: options:
source: *openstack-origin source: *openstack-origin
rabbitmq-server: rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1 num_units: 1
options: options:
source: *openstack-origin source: *openstack-origin
@ -24,7 +24,7 @@ applications:
neutron-security-groups: true neutron-security-groups: true
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
keystone: keystone:
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin

6
tests/bundles/bionic-ussuri.yaml
View File

@ -6,12 +6,12 @@ series: &series bionic
applications: applications:
percona-cluster: percona-cluster:
constraints: mem=3072M constraints: mem=3072M
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
options: options:
source: *openstack-origin source: *openstack-origin
rabbitmq-server: rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1 num_units: 1
options: options:
source: *openstack-origin source: *openstack-origin
@ -25,7 +25,7 @@ applications:
neutron-security-groups: true neutron-security-groups: true
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
keystone: keystone:
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin

12
tests/bundles/focal-ussuri.yaml
View File

@ -5,21 +5,21 @@ series: &series focal
applications: applications:
keystone-mysql-router: keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
neutron-mysql-router: neutron-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster: mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3 num_units: 3
options: options:
source: *openstack-origin source: *openstack-origin
rabbitmq-server: rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1 num_units: 1
options: options:
source: *openstack-origin source: *openstack-origin
neutron-api: neutron-api:
charm: cs:~openstack-charmers-next/neutron-api charm: cs:~openstack-charmers/neutron-api
series: *series series: *series
num_units: 1 num_units: 1
options: options:
@ -28,7 +28,7 @@ applications:
neutron-security-groups: true neutron-security-groups: true
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
keystone: keystone:
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin

12
tests/bundles/focal-victoria.yaml
View File

@ -5,21 +5,21 @@ series: &series focal
applications: applications:
keystone-mysql-router: keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
neutron-mysql-router: neutron-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster: mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3 num_units: 3
options: options:
source: *openstack-origin source: *openstack-origin
rabbitmq-server: rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1 num_units: 1
options: options:
source: *openstack-origin source: *openstack-origin
neutron-api: neutron-api:
charm: cs:~openstack-charmers-next/neutron-api charm: cs:~openstack-charmers/neutron-api
series: *series series: *series
num_units: 1 num_units: 1
options: options:
@ -28,7 +28,7 @@ applications:
neutron-security-groups: true neutron-security-groups: true
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
keystone: keystone:
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin

12
tests/bundles/groovy-victoria.yaml
View File

@ -5,21 +5,21 @@ series: &series groovy
applications: applications:
keystone-mysql-router: keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
neutron-mysql-router: neutron-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster: mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3 num_units: 3
options: options:
source: *openstack-origin source: *openstack-origin
rabbitmq-server: rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1 num_units: 1
options: options:
source: *openstack-origin source: *openstack-origin
neutron-api: neutron-api:
charm: cs:~openstack-charmers-next/neutron-api charm: cs:~openstack-charmers/neutron-api
series: *series series: *series
num_units: 1 num_units: 1
options: options:
@ -28,7 +28,7 @@ applications:
neutron-security-groups: true neutron-security-groups: true
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
keystone: keystone:
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin

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

@ -11,7 +11,7 @@ applications:
options: options:
source: *openstack-origin source: *openstack-origin
rabbitmq-server: rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1 num_units: 1
options: options:
source: *openstack-origin source: *openstack-origin
@ -24,7 +24,7 @@ applications:
neutron-security-groups: true neutron-security-groups: true
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
keystone: keystone:
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin

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

@ -6,12 +6,12 @@ series: &series xenial
applications: applications:
percona-cluster: percona-cluster:
constraints: mem=3072M constraints: mem=3072M
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
options: options:
source: *openstack-origin source: *openstack-origin
rabbitmq-server: rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1 num_units: 1
options: options:
source: *openstack-origin source: *openstack-origin
@ -24,7 +24,7 @@ applications:
neutron-security-groups: true neutron-security-groups: true
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
keystone: keystone:
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin

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

@ -6,12 +6,12 @@ series: &series xenial
applications: applications:
percona-cluster: percona-cluster:
constraints: mem=3072M constraints: mem=3072M
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
options: options:
source: *openstack-origin source: *openstack-origin
rabbitmq-server: rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1 num_units: 1
options: options:
source: *openstack-origin source: *openstack-origin
@ -24,7 +24,7 @@ applications:
neutron-security-groups: true neutron-security-groups: true
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
keystone: keystone:
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin

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

@ -6,12 +6,12 @@ series: &series xenial
applications: applications:
percona-cluster: percona-cluster:
constraints: mem=3072M constraints: mem=3072M
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
options: options:
source: *openstack-origin source: *openstack-origin
rabbitmq-server: rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1 num_units: 1
options: options:
source: *openstack-origin source: *openstack-origin
@ -24,7 +24,7 @@ applications:
neutron-security-groups: true neutron-security-groups: true
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
keystone: keystone:
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin

6
tests/bundles/xenial-queens.yaml
View File

@ -6,12 +6,12 @@ series: &series xenial
applications: applications:
percona-cluster: percona-cluster:
constraints: mem=3072M constraints: mem=3072M
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/percona-cluster
num_units: 1 num_units: 1
options: options:
source: *openstack-origin source: *openstack-origin
rabbitmq-server: rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1 num_units: 1
options: options:
source: *openstack-origin source: *openstack-origin
@ -24,7 +24,7 @@ applications:
neutron-security-groups: true neutron-security-groups: true
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
keystone: keystone:
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers/keystone
num_units: 1 num_units: 1
options: options:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin