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

21.10 - Stable cut of charms for testing period 

* use stable/21.10 libraries
* use zaza/zaza-openstack-tests at stable/21.10
* build.lock files for reactive charms
* bundles refer to ~openstack-charms candidate channel

Change-Id: I9f9c838dae7ffdae32765d2f6e3bd5726a5c81f1
This commit is contained in:
Alex Kavanagh 2021-10-11 19:08:34 +01:00
parent 5627cc9f7d
commit c613dcb8ed
31 changed files with 520 additions and 167 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/21.10

164
src/build.lock Normal file
View File

@ -0,0 +1,164 @@
{
"locks": [
{
"type": "layer",
"item": "layer:options",
"url": "https://github.com/juju-solutions/layer-options.git",
"vcs": null,
"branch": "refs/heads/master",
"commit": "fcdcea4e5de3e1556c24e6704607862d0ba00a56"
},
{
"type": "layer",
"item": "layer:basic",
"url": "https://github.com/juju-solutions/layer-basic.git",
"vcs": null,
"branch": "refs/heads/master",
"commit": "a3ff62c32c993d80417f6e093e3ef95e42f62083"
},
{
"type": "layer",
"item": "layer:openstack",
"url": "https://github.com/openstack/charm-layer-openstack",
"vcs": null,
"branch": "refs/heads/master",
"commit": "207bac8bec837edc6a4d6003f51d5b59d2d75adb"
},
{
"type": "layer",
"item": "neutron-api-plugin-arista",
"url": null,
"vcs": null,
"branch": "refs/heads/21.10-updates\nrefs/heads/master",
"commit": "refs/heads/21.10-updates\nrefs/heads/master"
},
{
"type": "layer",
"item": "interface:tls-certificates",
"url": "https://github.com/juju-solutions/interface-tls-certificates",
"vcs": null,
"branch": "refs/heads/master",
"commit": "d9850016d930a6d507b9fd45e2598d327922b140"
},
{
"type": "layer",
"item": "interface:neutron-plugin-api-subordinate",
"url": "https://github.com/openstack/charm-interface-neutron-plugin-api-subordinate",
"vcs": null,
"branch": "refs/heads/master",
"commit": "da16f317315280269821acb21338018bf0825a5a"
},
{
"type": "python_module",
"package": "Jinja2",
"vcs": null,
"version": "2.10.1"
},
{
"type": "python_module",
"package": "psutil",
"vcs": null,
"version": "5.8.0"
},
{
"type": "python_module",
"package": "setuptools",
"vcs": null,
"version": "41.6.0"
},
{
"type": "python_module",
"package": "pip",
"vcs": null,
"version": "18.1"
},
{
"type": "python_module",
"package": "pbr",
"vcs": null,
"version": "5.6.0"
},
{
"type": "python_module",
"package": "dnspython",
"vcs": null,
"version": "1.16.0"
},
{
"type": "python_module",
"package": "PyYAML",
"vcs": null,
"version": "5.2"
},
{
"type": "python_module",
"package": "setuptools_scm",
"vcs": null,
"version": "1.17.0"
},
{
"type": "python_module",
"package": "netifaces",
"vcs": null,
"version": "0.11.0"
},
{
"type": "python_module",
"package": "MarkupSafe",
"vcs": null,
"version": "1.1.1"
},
{
"type": "python_module",
"package": "Tempita",
"vcs": null,
"version": "0.4"
},
{
"type": "python_module",
"package": "charms.openstack",
"url": "git+https://github.com/openstack/charms.openstack.git",
"branch": "refs/heads/stable/21.10",
"version": "10627ee5f991c268f174d6d100e218a0e1867af1",
"vcs": "git"
},
{
"type": "python_module",
"package": "charms.reactive",
"vcs": null,
"version": "1.4.1"
},
{
"type": "python_module",
"package": "six",
"vcs": null,
"version": "1.16.0"
},
{
"type": "python_module",
"package": "charmhelpers",
"url": "git+https://github.com/juju/charm-helpers.git",
"branch": "refs/heads/stable/21.10",
"version": "26efcd0da51d580f68ead2ca13c38f58766f8a14",
"vcs": "git"
},
{
"type": "python_module",
"package": "netaddr",
"vcs": null,
"version": "0.7.19"
},
{
"type": "python_module",
"package": "wheel",
"vcs": null,
"version": "0.33.6"
},
{
"type": "python_module",
"package": "pyaml",
"vcs": null,
"version": "21.10.1"
}
]
}

4
src/test-requirements.txt
View File

@ -5,5 +5,5 @@
#
# Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
git+https://github.com/openstack-charmers/zaza.git#egg=zaza
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
git+https://github.com/openstack-charmers/zaza.git@stable/21.10#egg=zaza
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.10#egg=zaza.openstack

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

@ -6,23 +6,26 @@ series: &series bionic
applications:
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
channel: candidate
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
channel: candidate
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: *openstack-origin
@ -42,9 +45,10 @@ applications:
reverse-dns-lookup: False
dns-domain:
manage-neutron-plugin-legacy-mode: False
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
options:
prevent-arp-spoofing: True
@ -52,13 +56,15 @@ applications:
enable-local-dhcp-and-metadata: True
bridge-mappings: default:br-data
data-port: ens7
channel: candidate
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
network-manager: Neutron
channel: candidate
neutron-api-plugin-arista:
charm: ../../../neutron-api-plugin-arista
@ -72,7 +78,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:
@ -81,10 +87,12 @@ applications:
enable-live-migration: true
enable-resize: true
migration-auth-type: ssh
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate
lldpd:
charm: cs:lldpd

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

@ -6,23 +6,26 @@ series: &series bionic
applications:
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
channel: candidate
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
channel: candidate
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: *openstack-origin
@ -42,9 +45,10 @@ applications:
reverse-dns-lookup: False
dns-domain:
manage-neutron-plugin-legacy-mode: False
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
options:
prevent-arp-spoofing: True
@ -52,13 +56,15 @@ applications:
enable-local-dhcp-and-metadata: True
bridge-mappings: default:br-data
data-port: ens7
channel: candidate
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
network-manager: Neutron
channel: candidate
neutron-api-plugin-arista:
charm: ../../../neutron-api-plugin-arista
@ -75,7 +81,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:
@ -84,10 +90,12 @@ applications:
enable-live-migration: true
enable-resize: true
migration-auth-type: ssh
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate
lldpd:
charm: cs:lldpd

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

@ -6,23 +6,26 @@ series: &series bionic
applications:
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
channel: candidate
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
channel: candidate
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: *openstack-origin
@ -42,9 +45,10 @@ applications:
reverse-dns-lookup: False
dns-domain:
manage-neutron-plugin-legacy-mode: False
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
options:
prevent-arp-spoofing: True
@ -52,13 +56,15 @@ applications:
enable-local-dhcp-and-metadata: True
bridge-mappings: default:br-data
data-port: ens7
channel: candidate
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
network-manager: Neutron
channel: candidate
neutron-api-plugin-arista:
charm: ../../../neutron-api-plugin-arista
@ -72,7 +78,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:
@ -81,10 +87,12 @@ applications:
enable-live-migration: true
enable-resize: true
migration-auth-type: ssh
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate
lldpd:
charm: cs:lldpd

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

@ -6,23 +6,26 @@ series: &series bionic
applications:
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
channel: candidate
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
channel: candidate
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: *openstack-origin
@ -42,9 +45,10 @@ applications:
reverse-dns-lookup: False
dns-domain:
manage-neutron-plugin-legacy-mode: False
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
options:
prevent-arp-spoofing: True
@ -52,13 +56,15 @@ applications:
enable-local-dhcp-and-metadata: True
bridge-mappings: default:br-data
data-port: ens7
channel: candidate
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
network-manager: Neutron
channel: candidate
neutron-api-plugin-arista:
charm: ../../../neutron-api-plugin-arista
@ -72,13 +78,14 @@ applications:
api-type: EAPI
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *openstack-origin
channel: candidate
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
constraints: mem=4G cores=4
options:
@ -87,10 +94,12 @@ applications:
enable-live-migration: true
enable-resize: true
migration-auth-type: ssh
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate
lldpd:
charm: cs:lldpd

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

@ -6,23 +6,26 @@ series: &series bionic
applications:
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
channel: candidate
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
channel: candidate
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: *openstack-origin
@ -42,9 +45,10 @@ applications:
reverse-dns-lookup: False
dns-domain:
manage-neutron-plugin-legacy-mode: False
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
options:
prevent-arp-spoofing: True
@ -52,13 +56,15 @@ applications:
enable-local-dhcp-and-metadata: True
bridge-mappings: default:br-data
data-port: ens7
channel: candidate
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
network-manager: Neutron
channel: candidate
neutron-api-plugin-arista:
charm: ../../../neutron-api-plugin-arista
@ -72,13 +78,14 @@ applications:
api-type: EAPI
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *openstack-origin
channel: candidate
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
constraints: mem=4G cores=4
options:
@ -87,10 +94,12 @@ applications:
enable-live-migration: true
enable-resize: true
migration-auth-type: ssh
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate
lldpd:
charm: cs:lldpd

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

@ -6,36 +6,44 @@ series: &series focal
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
nova-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
neutron-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
placement-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
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
channel: candidate
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
channel: candidate
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: *openstack-origin
@ -55,9 +63,10 @@ applications:
reverse-dns-lookup: False
dns-domain:
manage-neutron-plugin-legacy-mode: False
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
options:
prevent-arp-spoofing: True
@ -65,13 +74,15 @@ applications:
enable-local-dhcp-and-metadata: True
bridge-mappings: default:br-data
data-port: ens7
channel: candidate
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
network-manager: Neutron
channel: candidate
neutron-api-plugin-arista:
charm: ../../../neutron-api-plugin-arista
@ -87,13 +98,14 @@ applications:
api-type: EAPI
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *openstack-origin
channel: candidate
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,10 +114,12 @@ applications:
enable-live-migration: true
enable-resize: true
migration-auth-type: ssh
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate
lldpd:
charm: cs:lldpd

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

@ -6,36 +6,44 @@ series: &series focal
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
nova-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
neutron-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
placement-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
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
channel: candidate
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
channel: candidate
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: *openstack-origin
@ -55,9 +63,10 @@ applications:
reverse-dns-lookup: False
dns-domain:
manage-neutron-plugin-legacy-mode: False
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
options:
prevent-arp-spoofing: True
@ -65,13 +74,15 @@ applications:
enable-local-dhcp-and-metadata: True
bridge-mappings: default:br-data
data-port: ens7
channel: candidate
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
network-manager: Neutron
channel: candidate
neutron-api-plugin-arista:
charm: ../../../neutron-api-plugin-arista
@ -87,13 +98,14 @@ applications:
api-type: EAPI
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *openstack-origin
channel: candidate
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,10 +114,12 @@ applications:
enable-live-migration: true
enable-resize: true
migration-auth-type: ssh
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate
lldpd:
charm: cs:lldpd

42
src/tests/bundles/focal-wallaby.yaml
View File

@ -6,36 +6,44 @@ series: &series focal
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
nova-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
neutron-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
placement-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
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
channel: candidate
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
channel: candidate
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: *openstack-origin
@ -55,9 +63,10 @@ applications:
reverse-dns-lookup: False
dns-domain:
manage-neutron-plugin-legacy-mode: False
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
options:
prevent-arp-spoofing: True
@ -65,13 +74,15 @@ applications:
enable-local-dhcp-and-metadata: True
bridge-mappings: default:br-data
data-port: ens7
channel: candidate
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
network-manager: Neutron
channel: candidate
neutron-api-plugin-arista:
charm: ../../../neutron-api-plugin-arista
@ -87,13 +98,14 @@ applications:
api-type: EAPI
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *openstack-origin
channel: candidate
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,10 +114,12 @@ applications:
enable-live-migration: true
enable-resize: true
migration-auth-type: ssh
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate
lldpd:
charm: cs:lldpd

42
src/tests/bundles/focal-xena.yaml
View File

@ -6,36 +6,44 @@ series: &series focal
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
nova-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
neutron-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
placement-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
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
channel: candidate
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
channel: candidate
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: *openstack-origin
@ -55,9 +63,10 @@ applications:
reverse-dns-lookup: False
dns-domain:
manage-neutron-plugin-legacy-mode: False
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
options:
prevent-arp-spoofing: True
@ -65,13 +74,15 @@ applications:
enable-local-dhcp-and-metadata: True
bridge-mappings: default:br-data
data-port: ens7
channel: candidate
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
network-manager: Neutron
channel: candidate
neutron-api-plugin-arista:
charm: ../../../neutron-api-plugin-arista
@ -87,13 +98,14 @@ applications:
api-type: EAPI
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *openstack-origin
channel: candidate
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,10 +114,12 @@ applications:
enable-live-migration: true
enable-resize: true
migration-auth-type: ssh
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate
lldpd:
charm: cs:lldpd

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

@ -6,36 +6,44 @@ series: &series groovy
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
nova-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
neutron-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
placement-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
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
channel: candidate
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
channel: candidate
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: *openstack-origin
@ -55,9 +63,10 @@ applications:
reverse-dns-lookup: False
dns-domain:
manage-neutron-plugin-legacy-mode: False
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
options:
prevent-arp-spoofing: True
@ -65,13 +74,15 @@ applications:
enable-local-dhcp-and-metadata: True
bridge-mappings: default:br-data
data-port: ens7
channel: candidate
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
network-manager: Neutron
channel: candidate
neutron-api-plugin-arista:
charm: ../../../neutron-api-plugin-arista
@ -87,13 +98,14 @@ applications:
api-type: EAPI
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *openstack-origin
channel: candidate
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,10 +114,12 @@ applications:
enable-live-migration: true
enable-resize: true
migration-auth-type: ssh
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate
lldpd:
charm: cs:lldpd
@ -114,7 +128,7 @@ applications:
short-name: true
arista-virt-test-fixture:
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
charm: cs:~openstack-charmers-next/arista-virt-test-ixture
num_units: 1
constraints: mem=4G

42
src/tests/bundles/hirsute-wallaby.yaml
View File

@ -6,36 +6,44 @@ series: &series hirsute
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
nova-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
neutron-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
placement-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
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
channel: candidate
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
channel: candidate
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: *openstack-origin
@ -55,9 +63,10 @@ applications:
reverse-dns-lookup: False
dns-domain:
manage-neutron-plugin-legacy-mode: False
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
options:
prevent-arp-spoofing: True
@ -65,13 +74,15 @@ applications:
enable-local-dhcp-and-metadata: True
bridge-mappings: default:br-data
data-port: ens7
channel: candidate
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
network-manager: Neutron
channel: candidate
neutron-api-plugin-arista:
charm: ../../../neutron-api-plugin-arista
@ -87,13 +98,14 @@ applications:
api-type: EAPI
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *openstack-origin
channel: candidate
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,10 +114,12 @@ applications:
enable-live-migration: true
enable-resize: true
migration-auth-type: ssh
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate
lldpd:
charm: cs:lldpd

42
src/tests/bundles/impish-xena.yaml
View File

@ -6,36 +6,44 @@ series: &series impish
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
nova-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
neutron-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
placement-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
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
channel: candidate
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
channel: candidate
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: *openstack-origin
@ -55,9 +63,10 @@ applications:
reverse-dns-lookup: False
dns-domain:
manage-neutron-plugin-legacy-mode: False
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
options:
prevent-arp-spoofing: True
@ -65,13 +74,15 @@ applications:
enable-local-dhcp-and-metadata: True
bridge-mappings: default:br-data
data-port: ens7
channel: candidate
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
network-manager: Neutron
channel: candidate
neutron-api-plugin-arista:
charm: ../../../neutron-api-plugin-arista
@ -87,13 +98,14 @@ applications:
api-type: EAPI
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *openstack-origin
channel: candidate
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,10 +114,12 @@ applications:
enable-live-migration: true
enable-resize: true
migration-auth-type: ssh
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate
lldpd:
charm: cs:lldpd

1
src/tests/bundles/overlays/bionic-queens.yaml.j2
View File

@ -1 +0,0 @@
arista-virt-test-fixture-image.yaml.j2

4
src/tests/bundles/overlays/bionic-queens.yaml.j2 Normal file
View File

@ -0,0 +1,4 @@
applications:
arista-virt-test-fixture:
resources:
arista-image: '{{ TEST_ARISTA_IMAGE_LOCAL }}'

1
src/tests/bundles/overlays/bionic-rocky.yaml.j2
View File

@ -1 +0,0 @@
arista-virt-test-fixture-image.yaml.j2

4
src/tests/bundles/overlays/bionic-rocky.yaml.j2 Normal file
View File

@ -0,0 +1,4 @@
applications:
arista-virt-test-fixture:
resources:
arista-image: '{{ TEST_ARISTA_IMAGE_LOCAL }}'

1
src/tests/bundles/overlays/bionic-stein.yaml.j2
View File

@ -1 +0,0 @@
arista-virt-test-fixture-image.yaml.j2

4
src/tests/bundles/overlays/bionic-stein.yaml.j2 Normal file
View File

@ -0,0 +1,4 @@
applications:
arista-virt-test-fixture:
resources:
arista-image: '{{ TEST_ARISTA_IMAGE_LOCAL }}'

1
src/tests/bundles/overlays/bionic-train.yaml.j2
View File

@ -1 +0,0 @@
arista-virt-test-fixture-image.yaml.j2

4
src/tests/bundles/overlays/bionic-train.yaml.j2 Normal file
View File

@ -0,0 +1,4 @@
applications:
arista-virt-test-fixture:
resources:
arista-image: '{{ TEST_ARISTA_IMAGE_LOCAL }}'

1
src/tests/bundles/overlays/bionic-ussuri.yaml.j2
View File

@ -1 +0,0 @@
arista-virt-test-fixture-image.yaml.j2

4
src/tests/bundles/overlays/bionic-ussuri.yaml.j2 Normal file
View File

@ -0,0 +1,4 @@
applications:
arista-virt-test-fixture:
resources:
arista-image: '{{ TEST_ARISTA_IMAGE_LOCAL }}'

1
src/tests/bundles/overlays/focal-ussuri.yaml.j2
View File

@ -1 +0,0 @@
arista-virt-test-fixture-image.yaml.j2

4
src/tests/bundles/overlays/focal-ussuri.yaml.j2 Normal file
View File

@ -0,0 +1,4 @@
applications:
arista-virt-test-fixture:
resources:
arista-image: '{{ TEST_ARISTA_IMAGE_LOCAL }}'

1
src/tests/bundles/overlays/focal-victoria.yaml.j2
View File

@ -1 +0,0 @@
arista-virt-test-fixture-image.yaml.j2

4
src/tests/bundles/overlays/focal-victoria.yaml.j2 Normal file
View File

@ -0,0 +1,4 @@
applications:
arista-virt-test-fixture:
resources:
arista-image: '{{ TEST_ARISTA_IMAGE_LOCAL }}'

1
src/tests/bundles/overlays/focal-wallaby.yaml.j2
View File

@ -1 +0,0 @@
arista-virt-test-fixture-image.yaml.j2

4
src/tests/bundles/overlays/focal-wallaby.yaml.j2 Normal file
View File

@ -0,0 +1,4 @@
applications:
arista-virt-test-fixture:
resources:
arista-image: '{{ TEST_ARISTA_IMAGE_LOCAL }}'

1
src/tests/bundles/overlays/focal-xena.yaml.j2
View File

@ -1 +0,0 @@
arista-virt-test-fixture-image.yaml.j2

4
src/tests/bundles/overlays/focal-xena.yaml.j2 Normal file
View File

@ -0,0 +1,4 @@
applications:
arista-virt-test-fixture:
resources:
arista-image: '{{ TEST_ARISTA_IMAGE_LOCAL }}'

1
src/tests/bundles/overlays/groovy-victoria.yaml.j2
View File

@ -1 +0,0 @@
arista-virt-test-fixture-image.yaml.j2

4
src/tests/bundles/overlays/groovy-victoria.yaml.j2 Normal file
View File

@ -0,0 +1,4 @@
applications:
arista-virt-test-fixture:
resources:
arista-image: '{{ TEST_ARISTA_IMAGE_LOCAL }}'

1
src/tests/bundles/overlays/hirsute-wallaby.yaml.j2
View File

@ -1 +0,0 @@
arista-virt-test-fixture-image.yaml.j2

4
src/tests/bundles/overlays/hirsute-wallaby.yaml.j2 Normal file
View File

@ -0,0 +1,4 @@
applications:
arista-virt-test-fixture:
resources:
arista-image: '{{ TEST_ARISTA_IMAGE_LOCAL }}'

1
src/tests/bundles/overlays/impish-xena.yaml.j2
View File

@ -1 +0,0 @@
arista-virt-test-fixture-image.yaml.j2

4
src/tests/bundles/overlays/impish-xena.yaml.j2 Normal file
View File

@ -0,0 +1,4 @@
applications:
arista-virt-test-fixture:
resources:
arista-image: '{{ TEST_ARISTA_IMAGE_LOCAL }}'

1
src/tests/bundles/overlays/xenial-queens.yaml.j2
View File

@ -1 +0,0 @@
arista-virt-test-fixture-image.yaml.j2

4
src/tests/bundles/overlays/xenial-queens.yaml.j2 Normal file
View File

@ -0,0 +1,4 @@
applications:
arista-virt-test-fixture:
resources:
arista-image: '{{ TEST_ARISTA_IMAGE_LOCAL }}'

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

@ -6,23 +6,26 @@ series: &series xenial
applications:
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
channel: candidate
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
channel: candidate
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: *openstack-origin
@ -42,9 +45,10 @@ applications:
reverse-dns-lookup: False
dns-domain:
manage-neutron-plugin-legacy-mode: False
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
options:
prevent-arp-spoofing: True
@ -52,13 +56,15 @@ applications:
enable-local-dhcp-and-metadata: True
bridge-mappings: default:br-data
data-port: ens7
channel: candidate
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
network-manager: Neutron
channel: candidate
neutron-api-plugin-arista:
charm: ../../../neutron-api-plugin-arista
@ -72,7 +78,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:
@ -81,10 +87,12 @@ applications:
enable-live-migration: true
enable-resize: true
migration-auth-type: ssh
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate
lldpd:
charm: cs:lldpd

4
src/wheelhouse.txt
View File

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

2
test-requirements.txt
View File

@ -33,7 +33,7 @@ mock>=1.2; python_version >= '3.6'
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/21.10#egg=charms.openstack
#
# Revisit for removal / mock improvement:
#