openstack
/
charm-octavia-dashboard
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: I981c26b449633960704c05d3606882d95eb654da
This commit is contained in:
Alex Kavanagh 2021-10-11 19:10:38 +01:00
parent b9b859c023
commit efbf7f90e7
16 changed files with 382 additions and 110 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-octavia-dashboard.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": "octavia-dashboard",
"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:dashboard-plugin",
"url": "https://github.com/openstack/charm-interface-dashboard-plugin.git",
"vcs": null,
"branch": "refs/heads/master",
"commit": "06031deac8b37e912dc69f1c6d2e2634696d2547"
},
{
"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

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

@ -26,39 +26,46 @@ relations:
- octavia-dashboard:dashboard
applications:
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
channel: candidate
mysql:
constraints: mem=3072M
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: cloud:bionic-rocky
neutron-security-groups: True
channel: candidate
neutron-openvswitch:
series: bionic
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
channel: candidate
octavia:
series: bionic
charm: cs:~openstack-charmers-next/octavia
charm: cs:~openstack-charmers/octavia
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
channel: candidate
openstack-dashboard:
series: bionic
charm: cs:~openstack-charmers-next/openstack-dashboard
charm: cs:~openstack-charmers/openstack-dashboard
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
channel: candidate
octavia-dashboard:
series: bionic
charm: ../../../octavia-dashboard
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate

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

@ -26,39 +26,46 @@ relations:
- octavia-dashboard:dashboard
applications:
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-stein
channel: candidate
mysql:
constraints: mem=3072M
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: cloud:bionic-stein
neutron-security-groups: True
channel: candidate
neutron-openvswitch:
series: bionic
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
channel: candidate
octavia:
series: bionic
charm: cs:~openstack-charmers-next/octavia
charm: cs:~openstack-charmers/octavia
num_units: 1
options:
openstack-origin: cloud:bionic-stein
channel: candidate
openstack-dashboard:
series: bionic
charm: cs:~openstack-charmers-next/openstack-dashboard
charm: cs:~openstack-charmers/openstack-dashboard
num_units: 1
options:
openstack-origin: cloud:bionic-stein
channel: candidate
octavia-dashboard:
series: bionic
charm: ../../../octavia-dashboard
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate

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

@ -26,39 +26,46 @@ relations:
- octavia-dashboard:dashboard
applications:
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-train
channel: candidate
mysql:
constraints: mem=3072M
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: cloud:bionic-train
neutron-security-groups: True
channel: candidate
neutron-openvswitch:
series: bionic
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
channel: candidate
octavia:
series: bionic
charm: cs:~openstack-charmers-next/octavia
charm: cs:~openstack-charmers/octavia
num_units: 1
options:
openstack-origin: cloud:bionic-train
channel: candidate
openstack-dashboard:
series: bionic
charm: cs:~openstack-charmers-next/openstack-dashboard
charm: cs:~openstack-charmers/openstack-dashboard
num_units: 1
options:
openstack-origin: cloud:bionic-train
channel: candidate
octavia-dashboard:
series: bionic
charm: ../../../octavia-dashboard
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate

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

@ -26,37 +26,44 @@ relations:
- octavia-dashboard:dashboard
applications:
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-ussuri
channel: candidate
mysql:
constraints: mem=3072M
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:
manage-neutron-plugin-legacy-mode: true
neutron-plugin: ovs
openstack-origin: cloud:bionic-ussuri
neutron-security-groups: True
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
channel: candidate
octavia:
charm: cs:~openstack-charmers-next/octavia
charm: cs:~openstack-charmers/octavia
num_units: 1
options:
openstack-origin: cloud:bionic-ussuri
channel: candidate
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
charm: cs:~openstack-charmers/openstack-dashboard
num_units: 1
options:
openstack-origin: cloud:bionic-ussuri
channel: candidate
octavia-dashboard:
charm: ../../../octavia-dashboard
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
channel: candidate

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

@ -21,16 +21,20 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
neutron-api-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
octavia-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
openstack-dashboard-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
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
@ -38,25 +42,28 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '4'
channel: candidate
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
manage-neutron-plugin-legacy-mode: true
@ -65,26 +72,30 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
channel: candidate
octavia:
charm: cs:~openstack-charmers-next/octavia
charm: cs:~openstack-charmers/octavia
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '6'
channel: candidate
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
charm: cs:~openstack-charmers/openstack-dashboard
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '7'
channel: candidate
octavia-dashboard:
charm: ../../../octavia-dashboard

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

@ -21,16 +21,20 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
neutron-api-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
octavia-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
openstack-dashboard-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
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
@ -38,25 +42,28 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '4'
channel: candidate
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
manage-neutron-plugin-legacy-mode: true
@ -65,26 +72,30 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
channel: candidate
octavia:
charm: cs:~openstack-charmers-next/octavia
charm: cs:~openstack-charmers/octavia
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '6'
channel: candidate
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
charm: cs:~openstack-charmers/openstack-dashboard
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '7'
channel: candidate
octavia-dashboard:
charm: ../../../octavia-dashboard

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

@ -21,16 +21,20 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
neutron-api-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
octavia-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
openstack-dashboard-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
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
@ -38,25 +42,28 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '4'
channel: candidate
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
manage-neutron-plugin-legacy-mode: true
@ -65,26 +72,30 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
channel: candidate
octavia:
charm: cs:~openstack-charmers-next/octavia
charm: cs:~openstack-charmers/octavia
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '6'
channel: candidate
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
charm: cs:~openstack-charmers/openstack-dashboard
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '7'
channel: candidate
octavia-dashboard:
charm: ../../../octavia-dashboard

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

@ -21,16 +21,20 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
neutron-api-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
octavia-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
openstack-dashboard-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
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
@ -38,25 +42,28 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '4'
channel: candidate
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
manage-neutron-plugin-legacy-mode: true
@ -65,26 +72,30 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
channel: candidate
octavia:
charm: cs:~openstack-charmers-next/octavia
charm: cs:~openstack-charmers/octavia
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '6'
channel: candidate
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
charm: cs:~openstack-charmers/openstack-dashboard
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '7'
channel: candidate
octavia-dashboard:
charm: ../../../octavia-dashboard

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

@ -21,16 +21,20 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
neutron-api-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
octavia-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
openstack-dashboard-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
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
@ -38,25 +42,28 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '4'
channel: candidate
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
manage-neutron-plugin-legacy-mode: true
@ -65,26 +72,30 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
channel: candidate
octavia:
charm: cs:~openstack-charmers-next/octavia
charm: cs:~openstack-charmers/octavia
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '6'
channel: candidate
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
charm: cs:~openstack-charmers/openstack-dashboard
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '7'
channel: candidate
octavia-dashboard:
charm: ../../../octavia-dashboard

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

@ -21,16 +21,20 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
neutron-api-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
octavia-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
openstack-dashboard-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
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
@ -38,25 +42,28 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '4'
channel: candidate
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
manage-neutron-plugin-legacy-mode: true
@ -65,26 +72,30 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
channel: candidate
octavia:
charm: cs:~openstack-charmers-next/octavia
charm: cs:~openstack-charmers/octavia
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '6'
channel: candidate
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
charm: cs:~openstack-charmers/openstack-dashboard
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '7'
channel: candidate
octavia-dashboard:
charm: ../../../octavia-dashboard

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

@ -21,16 +21,20 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
neutron-api-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
octavia-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
openstack-dashboard-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
channel: candidate
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
@ -38,25 +42,28 @@ applications:
- '0'
- '1'
- '2'
channel: candidate
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
channel: candidate
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '4'
channel: candidate
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
manage-neutron-plugin-legacy-mode: true
@ -65,26 +72,30 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: candidate
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:~openstack-charmers/neutron-openvswitch
num_units: 0
channel: candidate
octavia:
charm: cs:~openstack-charmers-next/octavia
charm: cs:~openstack-charmers/octavia
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '6'
channel: candidate
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
charm: cs:~openstack-charmers/openstack-dashboard
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '7'
channel: candidate
octavia-dashboard:
charm: ../../../octavia-dashboard

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

3
test-requirements.txt
View File

@ -3,6 +3,7 @@
# choices of *requirements.txt files for OpenStack Charms:
# https://github.com/openstack-charmers/release-tools
#
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
stestr>=2.2.0
@ -33,7 +34,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:
#