openstack
/
charm-neutron-api-plugin-arista
Code Issues Proposed changes

Updates for stable branch creation 

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: I0d25ac139cc97c87a2035e36a129b7aaa07041b5
This commit is contained in:
Aurelien Lourot 2020-11-02 11:48:50 +01:00
parent 3b895fab24
commit a21e9a18a8
12 changed files with 99 additions and 93 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
port=29418
project=openstack/charm-neutron-api-plugin-arista.git
defaultbranch=stable/20.10

16
src/tests/bundles/bionic-queens.yaml
View File

@ -6,23 +6,23 @@ series: &series bionic
applications:
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: *openstack-origin
@ -44,7 +44,7 @@ applications:
manage-neutron-plugin-legacy-mode: False
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
options:
prevent-arp-spoofing: True
@ -54,7 +54,7 @@ applications:
data-port: ens7
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
@ -72,7 +72,7 @@ applications:
api-type: EAPI
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
constraints: mem=4G cores=4
options:
@ -83,7 +83,7 @@ applications:
migration-auth-type: ssh
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
lldpd:

16
src/tests/bundles/bionic-rocky.yaml
View File

@ -6,23 +6,23 @@ series: &series bionic
applications:
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: *openstack-origin
@ -44,7 +44,7 @@ applications:
manage-neutron-plugin-legacy-mode: False
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
options:
prevent-arp-spoofing: True
@ -54,7 +54,7 @@ applications:
data-port: ens7
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
@ -75,7 +75,7 @@ applications:
api-type: EAPI
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
constraints: mem=4G cores=4
options:
@ -86,7 +86,7 @@ applications:
migration-auth-type: ssh
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
lldpd:

16
src/tests/bundles/bionic-stein.yaml
View File

@ -6,23 +6,23 @@ series: &series bionic
applications:
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: *openstack-origin
@ -44,7 +44,7 @@ applications:
manage-neutron-plugin-legacy-mode: False
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
options:
prevent-arp-spoofing: True
@ -54,7 +54,7 @@ applications:
data-port: ens7
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
@ -72,7 +72,7 @@ applications:
api-type: EAPI
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
constraints: mem=4G cores=4
options:
@ -83,7 +83,7 @@ applications:
migration-auth-type: ssh
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
lldpd:

18
src/tests/bundles/bionic-train.yaml
View File

@ -6,23 +6,23 @@ series: &series bionic
applications:
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: *openstack-origin
@ -44,7 +44,7 @@ applications:
manage-neutron-plugin-legacy-mode: False
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
options:
prevent-arp-spoofing: True
@ -54,7 +54,7 @@ applications:
data-port: ens7
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
@ -72,13 +72,13 @@ applications:
api-type: EAPI
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *openstack-origin
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
constraints: mem=4G cores=4
options:
@ -89,7 +89,7 @@ applications:
migration-auth-type: ssh
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
lldpd:

18
src/tests/bundles/bionic-ussuri.yaml
View File

@ -6,23 +6,23 @@ series: &series bionic
applications:
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: *openstack-origin
@ -44,7 +44,7 @@ applications:
manage-neutron-plugin-legacy-mode: False
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
options:
prevent-arp-spoofing: True
@ -54,7 +54,7 @@ applications:
data-port: ens7
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
@ -72,13 +72,13 @@ applications:
api-type: EAPI
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *openstack-origin
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
constraints: mem=4G cores=4
options:
@ -89,7 +89,7 @@ applications:
migration-auth-type: ssh
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
lldpd:

28
src/tests/bundles/focal-ussuri.yaml
View File

@ -6,36 +6,36 @@ series: &series focal
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
mysql-innodb-cluster:
constraints: mem=3072M
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: *openstack-origin
@ -57,7 +57,7 @@ applications:
manage-neutron-plugin-legacy-mode: False
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
options:
prevent-arp-spoofing: True
@ -67,7 +67,7 @@ applications:
data-port: ens7
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
@ -88,13 +88,13 @@ applications:
api-type: EAPI
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *openstack-origin
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
constraints: mem=4G cores=4
options:
@ -105,7 +105,7 @@ applications:
migration-auth-type: ssh
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
lldpd:

28
src/tests/bundles/focal-victoria.yaml
View File

@ -6,36 +6,36 @@ series: &series focal
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
mysql-innodb-cluster:
constraints: mem=3072M
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: *openstack-origin
@ -57,7 +57,7 @@ applications:
manage-neutron-plugin-legacy-mode: False
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
options:
prevent-arp-spoofing: True
@ -67,7 +67,7 @@ applications:
data-port: ens7
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
@ -88,13 +88,13 @@ applications:
api-type: EAPI
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *openstack-origin
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
constraints: mem=4G cores=4
options:
@ -105,7 +105,7 @@ applications:
migration-auth-type: ssh
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
lldpd:

28
src/tests/bundles/groovy-victoria.yaml
View File

@ -6,36 +6,36 @@ series: &series groovy
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
mysql-innodb-cluster:
constraints: mem=3072M
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: *openstack-origin
@ -57,7 +57,7 @@ applications:
manage-neutron-plugin-legacy-mode: False
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
options:
prevent-arp-spoofing: True
@ -67,7 +67,7 @@ applications:
data-port: ens7
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
@ -85,13 +85,13 @@ applications:
api-type: EAPI
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *openstack-origin
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
constraints: mem=4G cores=4
options:
@ -102,7 +102,7 @@ applications:
migration-auth-type: ssh
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
lldpd:

16
src/tests/bundles/xenial-queens.yaml
View File

@ -6,23 +6,23 @@ series: &series xenial
applications:
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: *openstack-origin
@ -44,7 +44,7 @@ applications:
manage-neutron-plugin-legacy-mode: False
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
options:
prevent-arp-spoofing: True
@ -54,7 +54,7 @@ applications:
data-port: ens7
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
@ -72,7 +72,7 @@ applications:
api-type: EAPI
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
constraints: mem=4G cores=4
options:
@ -83,7 +83,7 @@ applications:
migration-auth-type: ssh
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
lldpd:

4
src/wheelhouse.txt Normal file
View File

@ -0,0 +1,4 @@
git+https://opendev.org/openstack/charms.openstack.git@stable/20.10#egg=charms.openstack
git+https://github.com/juju/charm-helpers.git@stable/20.10#egg=charmhelpers

2
test-requirements.txt
View File

@ -12,7 +12,7 @@ charms.reactive
mock>=1.2
nose>=1.3.7
coverage>=3.6
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
git+https://github.com/openstack/charms.openstack.git@stable/20.10#egg=charms.openstack
#
# Revisit for removal / mock improvement:
netifaces # vault