openstack
/
charm-octavia-dashboard
Code Issues Proposed changes

Updates for zed stable branch creation 

- Set default branch for git review/gerrit to stable/zed
- Switch tests to stable.
- Switch to using stable charm-helpers branch.
- Switch to using stable charm.openstack branch.
- Switch to using stable zaza, zaza-openstack-tests
  branch
- (reactive charms) Add build.lock file
- (classic charms) make sync
- (reactive: not reactive plugin): lock charm-tools < 3.1
- (reactive: with reactive plugin): lock charm snap to 3.x/stable

Change-Id: Ib6e2e2148bcb38dca105ca17840840e54b69629f
This commit is contained in:
Alex Kavanagh 2022-10-14 17:09:03 +01:00 committed by Billy Olsen
parent a68761b7ef
commit d4e744c01d
9 changed files with 217 additions and 43 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/zed

2
requirements.txt
View File

@ -15,6 +15,6 @@ setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb
#
cryptography<3.4
git+https://github.com/juju/charm-tools.git
charm-tools<3.1
simplejson

176
src/build.lock Normal file
View File

@ -0,0 +1,176 @@
{
"locks": [
{
"type": "layer",
"item": "layer:options",
"url": "https://github.com/juju-solutions/layer-options.git",
"vcs": null,
"branch": "fcdcea4e5de3e1556c24e6704607862d0ba00a56",
"commit": "fcdcea4e5de3e1556c24e6704607862d0ba00a56"
},
{
"type": "layer",
"item": "layer:basic",
"url": "https://github.com/juju-solutions/layer-basic.git",
"vcs": null,
"branch": "edec607e05812df8d226b4aed71d09373767c0d7",
"commit": "edec607e05812df8d226b4aed71d09373767c0d7"
},
{
"type": "layer",
"item": "layer:openstack",
"url": "https://github.com/openstack/charm-layer-openstack",
"vcs": null,
"branch": "f9a11fde2e136fc45ee619f3e94eb93fcffb117d",
"commit": "f9a11fde2e136fc45ee619f3e94eb93fcffb117d"
},
{
"type": "layer",
"item": "octavia-dashboard",
"url": null,
"vcs": null,
"branch": "a68761b7efbf357ae51dfd5271bdedb2992a5d78",
"commit": "a68761b7efbf357ae51dfd5271bdedb2992a5d78"
},
{
"type": "layer",
"item": "interface:tls-certificates",
"url": "https://github.com/juju-solutions/interface-tls-certificates",
"vcs": null,
"branch": "d9850016d930a6d507b9fd45e2598d327922b140",
"commit": "d9850016d930a6d507b9fd45e2598d327922b140"
},
{
"type": "layer",
"item": "interface:dashboard-plugin",
"url": "https://github.com/openstack/charm-interface-dashboard-plugin.git",
"vcs": null,
"branch": "5fe099ee3065400e16902eadf009682e21852e9b",
"commit": "5fe099ee3065400e16902eadf009682e21852e9b"
},
{
"type": "python_module",
"package": "Jinja2",
"vcs": null,
"version": "3.1.2"
},
{
"type": "python_module",
"package": "pyaml",
"vcs": null,
"version": "21.10.1"
},
{
"type": "python_module",
"package": "dnspython",
"vcs": null,
"version": "2.2.1"
},
{
"type": "python_module",
"package": "MarkupSafe",
"vcs": null,
"version": "2.1.1"
},
{
"type": "python_module",
"package": "pyparsing",
"vcs": null,
"version": "3.0.9"
},
{
"type": "python_module",
"package": "tomli",
"vcs": null,
"version": "2.0.1"
},
{
"type": "python_module",
"package": "pbr",
"vcs": null,
"version": "5.10.0"
},
{
"type": "python_module",
"package": "charmhelpers",
"url": "git+https://github.com/juju/charm-helpers.git",
"branch": "stable/zed",
"version": "4f884fa39609e55a04348a44baa6b0ac3336bd08",
"vcs": "git"
},
{
"type": "python_module",
"package": "wheel",
"vcs": null,
"version": "0.37.1"
},
{
"type": "python_module",
"package": "charms.openstack",
"url": "git+https://github.com/openstack/charms.openstack.git",
"branch": "stable/zed",
"version": "bf2e867e9e18c28b0e1ba813440ec771b520b2aa",
"vcs": "git"
},
{
"type": "python_module",
"package": "packaging",
"vcs": null,
"version": "21.3"
},
{
"type": "python_module",
"package": "pip",
"vcs": null,
"version": "22.0.4"
},
{
"type": "python_module",
"package": "flit_core",
"vcs": null,
"version": "3.7.1"
},
{
"type": "python_module",
"package": "netifaces",
"vcs": null,
"version": "0.11.0"
},
{
"type": "python_module",
"package": "PyYAML",
"vcs": null,
"version": "5.3.1"
},
{
"type": "python_module",
"package": "charms.reactive",
"vcs": null,
"version": "1.5.1"
},
{
"type": "python_module",
"package": "setuptools_scm",
"vcs": null,
"version": "6.4.2"
},
{
"type": "python_module",
"package": "psutil",
"vcs": null,
"version": "5.9.2"
},
{
"type": "python_module",
"package": "netaddr",
"vcs": null,
"version": "0.7.19"
},
{
"type": "python_module",
"package": "setuptools",
"vcs": null,
"version": "62.1.0"
}
]
}

4
src/test-requirements.txt
View File

@ -8,5 +8,5 @@
tox
# 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/zed#egg=zaza
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/zed#egg=zaza.openstack

22
src/tests/bundles/jammy-yoga.yaml
View File

@ -22,16 +22,16 @@ applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
neutron-api-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
octavia-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
openstack-dashboard-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
@ -42,7 +42,7 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
channel: 8.0/edge
keystone:
charm: ch:keystone
@ -51,7 +51,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: latest/edge
channel: zed/edge
rabbitmq-server:
charm: ch:rabbitmq-server
@ -60,7 +60,7 @@ applications:
source: *openstack-origin
to:
- '4'
channel: latest/edge
channel: 3.9/edge
neutron-api:
charm: ch:neutron-api
@ -72,12 +72,12 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: latest/edge
channel: zed/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
num_units: 0
channel: latest/edge
channel: zed/edge
octavia:
charm: ch:octavia
@ -86,7 +86,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
channel: zed/edge
openstack-dashboard:
charm: ch:openstack-dashboard
@ -95,7 +95,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '7'
channel: latest/edge
channel: zed/edge
octavia-dashboard:
charm: ../../../octavia-dashboard_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm

26
src/tests/bundles/jammy-zed.yaml
View File

@ -22,27 +22,25 @@ applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
neutron-api-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
octavia-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
openstack-dashboard-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
channel: latest/edge
channel: 8.0/edge
keystone:
charm: ch:keystone
@ -51,16 +49,14 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: latest/edge
channel: zed/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '4'
channel: latest/edge
channel: 3.9/edge
neutron-api:
charm: ch:neutron-api
@ -72,12 +68,12 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: latest/edge
channel: zed/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
num_units: 0
channel: latest/edge
channel: zed/edge
octavia:
charm: ch:octavia
@ -86,7 +82,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
channel: zed/edge
openstack-dashboard:
charm: ch:openstack-dashboard
@ -95,7 +91,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '7'
channel: latest/edge
channel: zed/edge
octavia-dashboard:
charm: ../../../octavia-dashboard_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm

22
src/tests/bundles/kinetic-zed.yaml
View File

@ -22,16 +22,16 @@ applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
neutron-api-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
octavia-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
openstack-dashboard-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
@ -42,7 +42,7 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
channel: 8.0/edge
keystone:
charm: ch:keystone
@ -51,7 +51,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: latest/edge
channel: zed/edge
rabbitmq-server:
charm: ch:rabbitmq-server
@ -60,7 +60,7 @@ applications:
source: *openstack-origin
to:
- '4'
channel: latest/edge
channel: 3.9/edge
neutron-api:
charm: ch:neutron-api
@ -72,12 +72,12 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: latest/edge
channel: zed/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
num_units: 0
channel: latest/edge
channel: zed/edge
octavia:
charm: ch:octavia
@ -86,7 +86,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
channel: zed/edge
openstack-dashboard:
charm: ch:openstack-dashboard
@ -95,7 +95,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '7'
channel: latest/edge
channel: zed/edge
octavia-dashboard:
charm: ../../../octavia-dashboard_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm

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/zed#egg=charms.openstack
git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
git+https://github.com/juju/charm-helpers.git@stable/zed#egg=charmhelpers

2
test-requirements.txt
View File

@ -19,7 +19,7 @@ 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/zed#egg=charms.openstack
#
# Revisit for removal / mock improvement:
#