openstack
/
charm-neutron-api
Code Issues Proposed changes

Migrate charm to charmhub latest/edge track 

Change-Id: Ib851928504cd2032848202f9dd57551801aedbb6
This commit is contained in:
Alex Kavanagh 2022-01-27 15:25:27 +00:00 committed by Billy Olsen
parent 59ce3d96ce
commit 2079a9f02b
17 changed files with 75 additions and 417 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
charmcraft.yaml Normal file
View File

@ -0,0 +1,27 @@
type: charm
parts:
charm:
plugin: dump
source: .
prime:
- actions/*
- files/*
- hooks/*
- lib/*
- templates/*
- actions.yaml
- config.yaml
- copyright
- hardening.yaml
- icon.svg
- LICENSE
- Makefile
- metadata.yaml
- README.md
bases:
- name: ubuntu
channel: "20.04"
architectures:
- amd64

3
metadata.yaml
View File

@ -19,10 +19,7 @@ extra-bindings:
admin:
internal:
series:
- bionic
- focal
- groovy
- hirsute
- impish
provides:
nrpe-external-master:

10
osci.yaml
View File

@ -1,10 +1,6 @@
- project:
templates:
- charm-yoga-unit-jobs
- charm-yoga-functional-jobs
- charm-unit-jobs-py38
- charm-unit-jobs-py39
- charm-xena-functional-jobs
- charm-wallaby-functional-jobs
- charm-victoria-functional-jobs
- charm-ussuri-functional-jobs
- charm-stein-functional-jobs
- charm-queens-functional-jobs
- charm-yoga-functional-jobs

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

@ -1,39 +0,0 @@
variables:
openstack-origin: &openstack-origin distro
series: &series bionic
applications:
percona-cluster:
constraints: mem=3072M
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
options:
source: *openstack-origin
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
neutron-api:
charm: ../../../neutron-api
series: *series
num_units: 1
options:
flat-network-providers: physnet1
neutron-security-groups: true
openstack-origin: *openstack-origin
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
relations:
- - 'neutron-api:shared-db'
- 'percona-cluster:shared-db'
- - 'neutron-api:amqp'
- 'rabbitmq-server:amqp'
- - 'neutron-api:identity-service'
- 'keystone:identity-service'
- - 'keystone:shared-db'
- 'percona-cluster:shared-db'

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

@ -1,39 +0,0 @@
variables:
openstack-origin: &openstack-origin cloud:bionic-rocky
series: &series bionic
applications:
percona-cluster:
constraints: mem=3072M
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
options:
source: *openstack-origin
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
neutron-api:
charm: ../../../neutron-api
series: *series
num_units: 1
options:
flat-network-providers: physnet1
neutron-security-groups: true
openstack-origin: *openstack-origin
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
relations:
- - 'neutron-api:shared-db'
- 'percona-cluster:shared-db'
- - 'neutron-api:amqp'
- 'rabbitmq-server:amqp'
- - 'neutron-api:identity-service'
- 'keystone:identity-service'
- - 'keystone:shared-db'
- 'percona-cluster:shared-db'

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

@ -1,39 +0,0 @@
variables:
openstack-origin: &openstack-origin cloud:bionic-stein
series: &series bionic
applications:
percona-cluster:
constraints: mem=3072M
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
options:
source: *openstack-origin
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
neutron-api:
charm: ../../../neutron-api
series: *series
num_units: 1
options:
flat-network-providers: physnet1
neutron-security-groups: true
openstack-origin: *openstack-origin
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
relations:
- - 'neutron-api:shared-db'
- 'percona-cluster:shared-db'
- - 'neutron-api:amqp'
- 'rabbitmq-server:amqp'
- - 'neutron-api:identity-service'
- 'keystone:identity-service'
- - 'keystone:shared-db'
- 'percona-cluster:shared-db'

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

@ -1,39 +0,0 @@
variables:
openstack-origin: &openstack-origin cloud:bionic-train
series: &series bionic
applications:
percona-cluster:
constraints: mem=3072M
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
options:
source: *openstack-origin
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
neutron-api:
charm: ../../../neutron-api
series: *series
num_units: 1
options:
flat-network-providers: physnet1
neutron-security-groups: true
openstack-origin: *openstack-origin
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
relations:
- - 'neutron-api:shared-db'
- 'percona-cluster:shared-db'
- - 'neutron-api:amqp'
- 'rabbitmq-server:amqp'
- - 'neutron-api:identity-service'
- 'keystone:identity-service'
- - 'keystone:shared-db'
- 'percona-cluster:shared-db'

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

@ -1,40 +0,0 @@
variables:
openstack-origin: &openstack-origin cloud:bionic-ussuri
series: &series bionic
applications:
percona-cluster:
constraints: mem=3072M
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
options:
source: *openstack-origin
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
neutron-api:
charm: ../../../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
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
relations:
- - 'neutron-api:shared-db'
- 'percona-cluster:shared-db'
- - 'neutron-api:amqp'
- 'rabbitmq-server:amqp'
- - 'neutron-api:identity-service'
- 'keystone:identity-service'
- - 'keystone:shared-db'
- 'percona-cluster:shared-db'

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

@ -1,43 +0,0 @@
variables:
openstack-origin: &openstack-origin distro
series: &series focal
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
neutron-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
neutron-api:
charm: cs:~openstack-charmers-next/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
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
relations:
- - neutron-api:amqp
- rabbitmq-server:amqp
- - neutron-api:identity-service
- keystone:identity-service
- ["keystone:shared-db", "keystone-mysql-router:shared-db"]
- ["neutron-api:shared-db", "neutron-mysql-router:shared-db"]
- ["keystone-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
- ["neutron-mysql-router:db-router", "mysql-innodb-cluster:db-router"]

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

@ -1,43 +0,0 @@
variables:
openstack-origin: &openstack-origin cloud:focal-victoria
series: &series focal
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
neutron-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
neutron-api:
charm: cs:~openstack-charmers-next/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
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
relations:
- - neutron-api:amqp
- rabbitmq-server:amqp
- - neutron-api:identity-service
- keystone:identity-service
- ["keystone:shared-db", "keystone-mysql-router:shared-db"]
- ["neutron-api:shared-db", "neutron-mysql-router:shared-db"]
- ["keystone-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
- ["neutron-mysql-router:db-router", "mysql-innodb-cluster:db-router"]

43
tests/bundles/focal-wallaby.yaml
View File

@ -1,43 +0,0 @@
variables:
openstack-origin: &openstack-origin cloud:focal-wallaby
series: &series focal
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
neutron-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
neutron-api:
charm: cs:~openstack-charmers-next/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
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
relations:
- - neutron-api:amqp
- rabbitmq-server:amqp
- - neutron-api:identity-service
- keystone:identity-service
- ["keystone:shared-db", "keystone-mysql-router:shared-db"]
- ["neutron-api:shared-db", "neutron-mysql-router:shared-db"]
- ["keystone-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
- ["neutron-mysql-router:db-router", "mysql-innodb-cluster:db-router"]

18
tests/bundles/focal-xena.yaml
View File

@ -5,22 +5,25 @@ series: &series focal
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
neutron-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
channel: latest/edge
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: ch:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
channel: latest/edge
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
series: *series
charm: ../../
num_units: 1
options:
manage-neutron-plugin-legacy-mode: True
@ -28,10 +31,11 @@ applications:
neutron-security-groups: true
openstack-origin: *openstack-origin
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
channel: latest/edge
relations:
- - neutron-api:amqp
- rabbitmq-server:amqp

18
tests/bundles/focal-yoga.yaml
View File

@ -5,22 +5,25 @@ series: &series focal
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
neutron-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
channel: latest/edge
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: ch:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
channel: latest/edge
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
series: *series
charm: ../../
num_units: 1
options:
manage-neutron-plugin-legacy-mode: True
@ -28,10 +31,11 @@ applications:
neutron-security-groups: true
openstack-origin: *openstack-origin
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
channel: latest/edge
relations:
- - neutron-api:amqp
- rabbitmq-server:amqp

43
tests/bundles/hirsute-wallaby.yaml
View File

@ -1,43 +0,0 @@
variables:
openstack-origin: &openstack-origin distro
series: &series hirsute
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
neutron-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
neutron-api:
charm: cs:~openstack-charmers-next/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
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
relations:
- - neutron-api:amqp
- rabbitmq-server:amqp
- - neutron-api:identity-service
- keystone:identity-service
- ["keystone:shared-db", "keystone-mysql-router:shared-db"]
- ["neutron-api:shared-db", "neutron-mysql-router:shared-db"]
- ["keystone-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
- ["neutron-mysql-router:db-router", "mysql-innodb-cluster:db-router"]

18
tests/bundles/impish-xena.yaml
View File

@ -5,22 +5,25 @@ series: &series impish
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
neutron-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
channel: latest/edge
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: ch:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
channel: latest/edge
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
series: *series
charm: ../../
num_units: 1
options:
manage-neutron-plugin-legacy-mode: True
@ -28,10 +31,11 @@ applications:
neutron-security-groups: true
openstack-origin: *openstack-origin
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
channel: latest/edge
relations:
- - neutron-api:amqp
- rabbitmq-server:amqp

18
tests/bundles/jammy-yoga.yaml
View File

@ -5,22 +5,25 @@ series: &series jammy
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
neutron-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
channel: latest/edge
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: ch:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
channel: latest/edge
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
series: *series
charm: ../../
num_units: 1
options:
manage-neutron-plugin-legacy-mode: True
@ -28,10 +31,11 @@ applications:
neutron-security-groups: true
openstack-origin: *openstack-origin
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
channel: latest/edge
relations:
- - neutron-api:amqp
- rabbitmq-server:amqp

12
tests/tests.yaml
View File

@ -1,22 +1,13 @@
charm_name: neutron-api
gate_bundles:
- bionic-queens
- bionic-stein
- bionic-ussuri
- focal-ussuri
- focal-victoria
- focal-wallaby
- focal-xena
- hirsute-wallaby
- impish-xena
smoke_bundles:
- focal-ussuri
- focal-xena
dev_bundles:
- bionic-rocky
- bionic-train
- focal-yoga
- jammy-yoga
@ -33,6 +24,5 @@ tests_options:
policyd:
service: neutron
force_deploy:
- hirsute-wallaby
- impish-xena
- jammy-yoga