Stable artefacts for stable/2023.1 (antelope)
This patch is to lock the stable/2023.1 (antelope release) charms down so that as much as possible. In particular, this patch does: - set the .gitreview to stable/2023.1 - lock zaza and zaza-openstack-tests to stable/antelope branches - for reactive charms Add build.lock files to lock the layers and python modules used to build the charm. - for ops framework charms, extract a pip freeze from the charmcraft container after building the charm to lock the modules used to build the charm. - drop the kinetic bundles if the exist. (Note the updates to tests.yaml is in another batch (topic: antelope-voting) - update the bundles so that they point to the antelope specific channels. e.g. 2023.1/edge for OpenStack charms, 23.03/edge for OVN charms, quincy/edge for Ceph charms and generally, the appropriate LTS Jammy branch for the various support charms. Change-Id: I768ced4cfdd7c59a6cd3a251ad43dfa018619eac
This commit is contained in:
Alex Kavanagh
parent
c1c0741322
commit
3040ca25d4
|
|
@ -2,3 +2,5 @@
|
|||
host=review.opendev.org
|
||||
port=29418
|
||||
project=openstack/charm-nova-cell-controller.git
|
||||
|
||||
defaultbranch=stable/2023.1
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@ parts:
|
|||
plugin: reactive
|
||||
build-snaps:
|
||||
- charm
|
||||
build-packages:
|
||||
- python3-dev
|
||||
build-environment:
|
||||
- CHARM_INTERFACES_DIR: /root/project/interfaces/
|
||||
- CHARM_LAYERS_DIR: /root/project/layers/
|
||||
|
|
|
|||
|
|
@ -0,0 +1,254 @@
|
|||
{
|
||||
"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": "a41b3559d629993d960af65104108f66ab9795a8",
|
||||
"commit": "a41b3559d629993d960af65104108f66ab9795a8"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "layer:openstack",
|
||||
"url": "https://github.com/openstack/charm-layer-openstack",
|
||||
"vcs": null,
|
||||
"branch": "1c9e662d78b328c6d4587171ccba08572e8dcf25",
|
||||
"commit": "1c9e662d78b328c6d4587171ccba08572e8dcf25"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "layer:openstack-principle",
|
||||
"url": "https://github.com/openstack/charm-layer-openstack-principle",
|
||||
"vcs": null,
|
||||
"branch": "2541283a7f9c3fa923c0fccd7257e217e11dadcd",
|
||||
"commit": "2541283a7f9c3fa923c0fccd7257e217e11dadcd"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "layer:openstack-api",
|
||||
"url": "https://github.com/openstack/charm-layer-openstack-api",
|
||||
"vcs": null,
|
||||
"branch": "34311a62e963d0ce903b7ddb9d70b8f071f71651",
|
||||
"commit": "34311a62e963d0ce903b7ddb9d70b8f071f71651"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "nova-cell-controller",
|
||||
"url": null,
|
||||
"vcs": null,
|
||||
"branch": null,
|
||||
"commit": ""
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "interface:tls-certificates",
|
||||
"url": "https://github.com/juju-solutions/interface-tls-certificates",
|
||||
"vcs": null,
|
||||
"branch": "61e9f278fc8c8119b1d4810ac39e2275be58e9ce",
|
||||
"commit": "61e9f278fc8c8119b1d4810ac39e2275be58e9ce"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "interface:mysql-shared",
|
||||
"url": "https://github.com/openstack/charm-interface-mysql-shared",
|
||||
"vcs": null,
|
||||
"branch": "f90f8c6edce21e4da3a872f0f9d6761730ce025d",
|
||||
"commit": "f90f8c6edce21e4da3a872f0f9d6761730ce025d"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "interface:rabbitmq",
|
||||
"url": "https://github.com/openstack/charm-interface-rabbitmq",
|
||||
"vcs": null,
|
||||
"branch": "383121fc584d2d3bf9d233eba0d3708398a4c468",
|
||||
"commit": "383121fc584d2d3bf9d233eba0d3708398a4c468"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "interface:keystone",
|
||||
"url": "https://github.com/openstack/charm-interface-keystone",
|
||||
"vcs": null,
|
||||
"branch": "36ea7b385a569ebabca7184ed4ce8420bb8fa61a",
|
||||
"commit": "36ea7b385a569ebabca7184ed4ce8420bb8fa61a"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "interface:hacluster",
|
||||
"url": "https://github.com/openstack/charm-interface-hacluster.git",
|
||||
"vcs": null,
|
||||
"branch": "5fc5216f51dcf98530d45e137d55fd94b39d150a",
|
||||
"commit": "5fc5216f51dcf98530d45e137d55fd94b39d150a"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "interface:openstack-ha",
|
||||
"url": "https://github.com/openstack/charm-interface-openstack-ha",
|
||||
"vcs": null,
|
||||
"branch": "a3b00e5b5fd857d130698c5cfe4b918877f0ab80",
|
||||
"commit": "a3b00e5b5fd857d130698c5cfe4b918877f0ab80"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "interface:nova-compute",
|
||||
"url": "https://github.com/openstack/charm-interface-nova-compute.git",
|
||||
"vcs": null,
|
||||
"branch": "ea0721a6fa4c3db2fdbee4622e29870e865f58ad",
|
||||
"commit": "ea0721a6fa4c3db2fdbee4622e29870e865f58ad"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "interface:nova-cell",
|
||||
"url": "https://github.com/openstack/charm-interface-nova-cell.git",
|
||||
"vcs": null,
|
||||
"branch": "620f9eef998ef587d951e1475a1e2168551e3d23",
|
||||
"commit": "620f9eef998ef587d951e1475a1e2168551e3d23"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "interface:keystone-credentials",
|
||||
"url": "https://github.com/openstack/charm-interface-keystone-credentials",
|
||||
"vcs": null,
|
||||
"branch": "53e93b8820899f2251d207ed5d5c3b212ceb64de",
|
||||
"commit": "53e93b8820899f2251d207ed5d5c3b212ceb64de"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "MarkupSafe",
|
||||
"vcs": null,
|
||||
"version": "2.1.2"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "packaging",
|
||||
"vcs": null,
|
||||
"version": "23.1"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "netifaces",
|
||||
"vcs": null,
|
||||
"version": "0.11.0"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "pip",
|
||||
"vcs": null,
|
||||
"version": "22.0.4"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "poetry_core",
|
||||
"vcs": null,
|
||||
"version": "1.5.2"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "charms.reactive",
|
||||
"vcs": null,
|
||||
"version": "1.5.2"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "charms.openstack",
|
||||
"url": "git+https://github.com/openstack/charms.openstack.git",
|
||||
"branch": "stable/antelope",
|
||||
"version": "7a589883545284e0a6303c7977402afb38e99d46",
|
||||
"vcs": "git"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "dnspython",
|
||||
"vcs": null,
|
||||
"version": "2.3.0"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "pbr",
|
||||
"vcs": null,
|
||||
"version": "5.11.1"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "tomli",
|
||||
"vcs": null,
|
||||
"version": "2.0.1"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "charmhelpers",
|
||||
"url": "git+https://github.com/juju/charm-helpers.git",
|
||||
"branch": "stable/antelope",
|
||||
"version": "b9444c20fdf3dc938790ed208cd1053b60055590",
|
||||
"vcs": "git"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "wheel",
|
||||
"vcs": null,
|
||||
"version": "0.40.0"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "PyYAML",
|
||||
"vcs": null,
|
||||
"version": "6.0"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "setuptools_scm",
|
||||
"vcs": null,
|
||||
"version": "6.4.2"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "Cython",
|
||||
"vcs": null,
|
||||
"version": "0.29.34"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "setuptools",
|
||||
"vcs": null,
|
||||
"version": "49.6.0"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "flit_core",
|
||||
"vcs": null,
|
||||
"version": "3.8.0"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "psutil",
|
||||
"vcs": null,
|
||||
"version": "5.9.5"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "pyaml",
|
||||
"vcs": null,
|
||||
"version": "21.10.1"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "netaddr",
|
||||
"vcs": null,
|
||||
"version": "0.7.19"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "Jinja2",
|
||||
"vcs": null,
|
||||
"version": "3.1.2"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -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/antelope#egg=zaza
|
||||
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/antelope#egg=zaza.openstack
|
||||
|
|
|
|||
|
|
@ -38,24 +38,24 @@ 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
|
||||
glance-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: 8.0/edge
|
||||
nova-cloud-controller-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: 8.0/edge
|
||||
nova-cell-controller-cell2-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
options:
|
||||
base-port: 3316
|
||||
channel: latest/edge
|
||||
channel: 8.0/edge
|
||||
placement-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: 8.0/edge
|
||||
|
||||
mysql-innodb-cluster:
|
||||
charm: ch:mysql-innodb-cluster
|
||||
|
|
@ -66,7 +66,7 @@ applications:
|
|||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
channel: latest/edge
|
||||
channel: 8.0/edge
|
||||
|
||||
mysql-innodb-cluster-cell2:
|
||||
charm: ch:mysql-innodb-cluster
|
||||
|
|
@ -77,7 +77,7 @@ applications:
|
|||
- '3'
|
||||
- '4'
|
||||
- '5'
|
||||
channel: latest/edge
|
||||
channel: 8.0/edge
|
||||
|
||||
glance:
|
||||
charm: ch:glance
|
||||
|
|
@ -87,7 +87,7 @@ applications:
|
|||
worker-multiplier: 0.25
|
||||
to:
|
||||
- '6'
|
||||
channel: latest/edge
|
||||
channel: 2023.1/edge
|
||||
|
||||
keystone:
|
||||
charm: ch:keystone
|
||||
|
|
@ -98,7 +98,7 @@ applications:
|
|||
worker-multiplier: 0.25
|
||||
to:
|
||||
- '7'
|
||||
channel: latest/edge
|
||||
channel: 2023.1/edge
|
||||
|
||||
neutron-api:
|
||||
charm: ch:neutron-api
|
||||
|
|
@ -112,7 +112,7 @@ applications:
|
|||
worker-multiplier: 0.25
|
||||
to:
|
||||
- '8'
|
||||
channel: latest/edge
|
||||
channel: 2023.1/edge
|
||||
|
||||
neutron-gateway:
|
||||
charm: ch:neutron-gateway
|
||||
|
|
@ -123,12 +123,12 @@ applications:
|
|||
worker-multiplier: 0.25
|
||||
to:
|
||||
- '9'
|
||||
channel: latest/edge
|
||||
channel: 2023.1/edge
|
||||
|
||||
neutron-openvswitch:
|
||||
charm: ch:neutron-openvswitch
|
||||
num_units: 0
|
||||
channel: latest/edge
|
||||
channel: 2023.1/edge
|
||||
|
||||
nova-cloud-controller:
|
||||
charm: ch:nova-cloud-controller
|
||||
|
|
@ -140,7 +140,7 @@ applications:
|
|||
debug: true
|
||||
to:
|
||||
- '10'
|
||||
channel: latest/edge
|
||||
channel: 2023.1/edge
|
||||
|
||||
nova-cell-controller-cell2:
|
||||
charm: ../../../nova-cell-controller.charm
|
||||
|
|
@ -166,28 +166,28 @@ applications:
|
|||
debug: true
|
||||
to:
|
||||
- '12'
|
||||
channel: latest/edge
|
||||
channel: 2023.1/edge
|
||||
|
||||
rabbitmq-server-nova:
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
to:
|
||||
- '13'
|
||||
channel: latest/edge
|
||||
channel: 3.9/edge
|
||||
|
||||
rabbitmq-server-nova-cell2:
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
to:
|
||||
- '14'
|
||||
channel: latest/edge
|
||||
channel: 3.9/edge
|
||||
|
||||
rabbitmq-server-neutron:
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
to:
|
||||
- '15'
|
||||
channel: latest/edge
|
||||
channel: 3.9/edge
|
||||
|
||||
placement:
|
||||
charm: ch:placement
|
||||
|
|
@ -197,7 +197,7 @@ applications:
|
|||
debug: true
|
||||
to:
|
||||
- '16'
|
||||
channel: latest/edge
|
||||
channel: 2023.1/edge
|
||||
|
||||
relations:
|
||||
|
||||
|
|
|
|||
|
|
@ -38,24 +38,24 @@ 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
|
||||
glance-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: 8.0/edge
|
||||
nova-cloud-controller-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: 8.0/edge
|
||||
nova-cell-controller-cell2-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
options:
|
||||
base-port: 3316
|
||||
channel: latest/edge
|
||||
channel: 8.0/edge
|
||||
placement-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: 8.0/edge
|
||||
|
||||
mysql-innodb-cluster:
|
||||
charm: ch:mysql-innodb-cluster
|
||||
|
|
@ -66,7 +66,7 @@ applications:
|
|||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
channel: latest/edge
|
||||
channel: 8.0/edge
|
||||
|
||||
mysql-innodb-cluster-cell2:
|
||||
charm: ch:mysql-innodb-cluster
|
||||
|
|
@ -77,7 +77,7 @@ applications:
|
|||
- '3'
|
||||
- '4'
|
||||
- '5'
|
||||
channel: latest/edge
|
||||
channel: 8.0/edge
|
||||
|
||||
glance:
|
||||
charm: ch:glance
|
||||
|
|
@ -87,7 +87,7 @@ applications:
|
|||
worker-multiplier: 0.25
|
||||
to:
|
||||
- '6'
|
||||
channel: latest/edge
|
||||
channel: 2023.1/edge
|
||||
|
||||
keystone:
|
||||
charm: ch:keystone
|
||||
|
|
@ -98,7 +98,7 @@ applications:
|
|||
worker-multiplier: 0.25
|
||||
to:
|
||||
- '7'
|
||||
channel: latest/edge
|
||||
channel: 2023.1/edge
|
||||
|
||||
neutron-api:
|
||||
charm: ch:neutron-api
|
||||
|
|
@ -112,7 +112,7 @@ applications:
|
|||
worker-multiplier: 0.25
|
||||
to:
|
||||
- '8'
|
||||
channel: latest/edge
|
||||
channel: 2023.1/edge
|
||||
|
||||
neutron-gateway:
|
||||
charm: ch:neutron-gateway
|
||||
|
|
@ -123,12 +123,12 @@ applications:
|
|||
worker-multiplier: 0.25
|
||||
to:
|
||||
- '9'
|
||||
channel: latest/edge
|
||||
channel: 2023.1/edge
|
||||
|
||||
neutron-openvswitch:
|
||||
charm: ch:neutron-openvswitch
|
||||
num_units: 0
|
||||
channel: latest/edge
|
||||
channel: 2023.1/edge
|
||||
|
||||
nova-cloud-controller:
|
||||
charm: ch:nova-cloud-controller
|
||||
|
|
@ -140,7 +140,7 @@ applications:
|
|||
debug: true
|
||||
to:
|
||||
- '10'
|
||||
channel: latest/edge
|
||||
channel: 2023.1/edge
|
||||
|
||||
nova-cell-controller-cell2:
|
||||
charm: ../../../nova-cell-controller.charm
|
||||
|
|
@ -166,28 +166,28 @@ applications:
|
|||
debug: true
|
||||
to:
|
||||
- '12'
|
||||
channel: latest/edge
|
||||
channel: 2023.1/edge
|
||||
|
||||
rabbitmq-server-nova:
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
to:
|
||||
- '13'
|
||||
channel: latest/edge
|
||||
channel: 3.9/edge
|
||||
|
||||
rabbitmq-server-nova-cell2:
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
to:
|
||||
- '14'
|
||||
channel: latest/edge
|
||||
channel: 3.9/edge
|
||||
|
||||
rabbitmq-server-neutron:
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
to:
|
||||
- '15'
|
||||
channel: latest/edge
|
||||
channel: 3.9/edge
|
||||
|
||||
placement:
|
||||
charm: ch:placement
|
||||
|
|
@ -197,7 +197,7 @@ applications:
|
|||
debug: true
|
||||
to:
|
||||
- '16'
|
||||
channel: latest/edge
|
||||
channel: 2023.1/edge
|
||||
|
||||
relations:
|
||||
|
||||
|
|
|
|||
|
|
@ -1,310 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
local_overlay_enabled: False
|
||||
|
||||
series: kinetic
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
|
||||
machines:
|
||||
'0':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
'1':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
'2':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
'3':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
'4':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
'5':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
'6':
|
||||
'7':
|
||||
'8':
|
||||
'9':
|
||||
'10':
|
||||
'11':
|
||||
'12':
|
||||
constraints: mem=4096M
|
||||
'13':
|
||||
'14':
|
||||
'15':
|
||||
'16':
|
||||
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
neutron-api-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
glance-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
nova-cloud-controller-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
nova-cell-controller-cell2-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
options:
|
||||
base-port: 3316
|
||||
channel: latest/edge
|
||||
placement-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
|
||||
mysql-innodb-cluster:
|
||||
charm: ch:mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
channel: latest/edge
|
||||
|
||||
mysql-innodb-cluster-cell2:
|
||||
charm: ch:mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
- '4'
|
||||
- '5'
|
||||
channel: latest/edge
|
||||
|
||||
glance:
|
||||
charm: ch:glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
worker-multiplier: 0.25
|
||||
to:
|
||||
- '6'
|
||||
channel: latest/edge
|
||||
|
||||
keystone:
|
||||
charm: ch:keystone
|
||||
num_units: 1
|
||||
options:
|
||||
admin-password: openstack
|
||||
openstack-origin: *openstack-origin
|
||||
worker-multiplier: 0.25
|
||||
to:
|
||||
- '7'
|
||||
channel: latest/edge
|
||||
|
||||
neutron-api:
|
||||
charm: ch:neutron-api
|
||||
num_units: 1
|
||||
options:
|
||||
manage-neutron-plugin-legacy-mode: true
|
||||
neutron-plugin: ovs
|
||||
flat-network-providers: physnet1
|
||||
neutron-security-groups: true
|
||||
openstack-origin: *openstack-origin
|
||||
worker-multiplier: 0.25
|
||||
to:
|
||||
- '8'
|
||||
channel: latest/edge
|
||||
|
||||
neutron-gateway:
|
||||
charm: ch:neutron-gateway
|
||||
num_units: 1
|
||||
options:
|
||||
bridge-mappings: physnet1:br-ex
|
||||
openstack-origin: *openstack-origin
|
||||
worker-multiplier: 0.25
|
||||
to:
|
||||
- '9'
|
||||
channel: latest/edge
|
||||
|
||||
neutron-openvswitch:
|
||||
charm: ch:neutron-openvswitch
|
||||
num_units: 0
|
||||
channel: latest/edge
|
||||
|
||||
nova-cloud-controller:
|
||||
charm: ch:nova-cloud-controller
|
||||
num_units: 1
|
||||
options:
|
||||
network-manager: Neutron
|
||||
openstack-origin: *openstack-origin
|
||||
worker-multiplier: 0.25
|
||||
debug: true
|
||||
to:
|
||||
- '10'
|
||||
channel: latest/edge
|
||||
|
||||
nova-cell-controller-cell2:
|
||||
charm: ../../../nova-cell-controller.charm
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
worker-multiplier: 0.25
|
||||
debug: true
|
||||
cell-name: "cell2"
|
||||
to:
|
||||
- '11'
|
||||
|
||||
nova-compute-cell2:
|
||||
charm: ch:nova-compute
|
||||
num_units: 1
|
||||
storage:
|
||||
ephemeral-device: '40G'
|
||||
options:
|
||||
enable-live-migration: true
|
||||
enable-resize: true
|
||||
migration-auth-type: ssh
|
||||
openstack-origin: *openstack-origin
|
||||
debug: true
|
||||
to:
|
||||
- '12'
|
||||
channel: latest/edge
|
||||
|
||||
rabbitmq-server-nova:
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
to:
|
||||
- '13'
|
||||
channel: latest/edge
|
||||
|
||||
rabbitmq-server-nova-cell2:
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
to:
|
||||
- '14'
|
||||
channel: latest/edge
|
||||
|
||||
rabbitmq-server-neutron:
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
to:
|
||||
- '15'
|
||||
channel: latest/edge
|
||||
|
||||
placement:
|
||||
charm: ch:placement
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
debug: true
|
||||
to:
|
||||
- '16'
|
||||
channel: latest/edge
|
||||
|
||||
relations:
|
||||
|
||||
- - 'nova-cloud-controller:nova-cell-api'
|
||||
- 'nova-cell-controller-cell2:nova-cell-compute'
|
||||
|
||||
- - 'nova-cloud-controller:shared-db-cell'
|
||||
- 'nova-cell-controller-cell2-mysql-router:shared-db'
|
||||
|
||||
- - 'nova-cloud-controller:amqp-cell'
|
||||
- 'rabbitmq-server-nova-cell2:amqp'
|
||||
|
||||
- - 'nova-compute-cell2:amqp'
|
||||
- 'rabbitmq-server-nova-cell2:amqp'
|
||||
|
||||
- - 'neutron-gateway:amqp'
|
||||
- 'rabbitmq-server-neutron:amqp'
|
||||
|
||||
- - 'neutron-gateway:amqp-nova'
|
||||
- 'rabbitmq-server-nova:amqp'
|
||||
|
||||
- - 'keystone:shared-db'
|
||||
- 'keystone-mysql-router:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'nova-cloud-controller:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'glance:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'neutron-api:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'neutron-openvswitch:neutron-plugin-api'
|
||||
- 'neutron-api:neutron-plugin-api'
|
||||
|
||||
- - 'neutron-api:shared-db'
|
||||
- 'neutron-api-mysql-router:shared-db'
|
||||
- - 'neutron-api-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'neutron-api:amqp'
|
||||
- 'rabbitmq-server-neutron:amqp'
|
||||
|
||||
- - 'neutron-gateway:neutron-plugin-api'
|
||||
- 'neutron-api:neutron-plugin-api'
|
||||
|
||||
- - 'glance:shared-db'
|
||||
- 'glance-mysql-router:shared-db'
|
||||
- - 'glance-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'glance:amqp'
|
||||
- 'rabbitmq-server-neutron:amqp'
|
||||
|
||||
- - 'nova-cloud-controller:image-service'
|
||||
- 'glance:image-service'
|
||||
|
||||
- - 'nova-compute-cell2:image-service'
|
||||
- 'glance:image-service'
|
||||
|
||||
- - 'nova-cell-controller-cell2:cloud-compute'
|
||||
- 'nova-compute-cell2:cloud-compute'
|
||||
|
||||
- - 'nova-cell-controller-cell2:identity-credentials'
|
||||
- 'keystone:identity-credentials'
|
||||
|
||||
- - 'nova-cloud-controller:amqp'
|
||||
- 'rabbitmq-server-nova:amqp'
|
||||
|
||||
- - 'nova-cell-controller-cell2:amqp'
|
||||
- 'rabbitmq-server-nova-cell2:amqp'
|
||||
|
||||
- - 'nova-cloud-controller:quantum-network-service'
|
||||
- 'neutron-gateway:quantum-network-service'
|
||||
|
||||
- - 'nova-compute-cell2:neutron-plugin'
|
||||
- 'neutron-openvswitch:neutron-plugin'
|
||||
|
||||
- - 'neutron-openvswitch:amqp'
|
||||
- 'rabbitmq-server-neutron:amqp'
|
||||
|
||||
- - 'nova-cloud-controller:shared-db'
|
||||
- 'nova-cloud-controller-mysql-router:shared-db'
|
||||
- - 'nova-cloud-controller-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'nova-cell-controller-cell2:shared-db'
|
||||
- 'nova-cell-controller-cell2-mysql-router:shared-db'
|
||||
- - 'nova-cell-controller-cell2-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster-cell2:db-router'
|
||||
|
||||
- - 'nova-cloud-controller:neutron-api'
|
||||
- 'neutron-api:neutron-api'
|
||||
|
||||
- - 'nova-compute-cell2:cloud-credentials'
|
||||
- 'keystone:identity-credentials'
|
||||
|
||||
- - 'placement:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'placement:shared-db'
|
||||
- 'placement-mysql-router:shared-db'
|
||||
- - 'placement-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'nova-cloud-controller:placement'
|
||||
- 'placement:placement'
|
||||
|
|
@ -38,24 +38,24 @@ 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
|
||||
glance-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: 8.0/edge
|
||||
nova-cloud-controller-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: 8.0/edge
|
||||
nova-cell-controller-cell2-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
options:
|
||||
base-port: 3316
|
||||
channel: latest/edge
|
||||
channel: 8.0/edge
|
||||
placement-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: 8.0/edge
|
||||
|
||||
mysql-innodb-cluster:
|
||||
charm: ch:mysql-innodb-cluster
|
||||
|
|
@ -66,7 +66,7 @@ applications:
|
|||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
channel: latest/edge
|
||||
channel: 8.0/edge
|
||||
|
||||
mysql-innodb-cluster-cell2:
|
||||
charm: ch:mysql-innodb-cluster
|
||||
|
|
@ -77,7 +77,7 @@ applications:
|
|||
- '3'
|
||||
- '4'
|
||||
- '5'
|
||||
channel: latest/edge
|
||||
channel: 8.0/edge
|
||||
|
||||
glance:
|
||||
charm: ch:glance
|
||||
|
|
@ -87,7 +87,7 @@ applications:
|
|||
worker-multiplier: 0.25
|
||||
to:
|
||||
- '6'
|
||||
channel: latest/edge
|
||||
channel: 2023.1/edge
|
||||
|
||||
keystone:
|
||||
charm: ch:keystone
|
||||
|
|
@ -98,7 +98,7 @@ applications:
|
|||
worker-multiplier: 0.25
|
||||
to:
|
||||
- '7'
|
||||
channel: latest/edge
|
||||
channel: 2023.1/edge
|
||||
|
||||
neutron-api:
|
||||
charm: ch:neutron-api
|
||||
|
|
@ -112,7 +112,7 @@ applications:
|
|||
worker-multiplier: 0.25
|
||||
to:
|
||||
- '8'
|
||||
channel: latest/edge
|
||||
channel: 2023.1/edge
|
||||
|
||||
neutron-gateway:
|
||||
charm: ch:neutron-gateway
|
||||
|
|
@ -123,12 +123,12 @@ applications:
|
|||
worker-multiplier: 0.25
|
||||
to:
|
||||
- '9'
|
||||
channel: latest/edge
|
||||
channel: 2023.1/edge
|
||||
|
||||
neutron-openvswitch:
|
||||
charm: ch:neutron-openvswitch
|
||||
num_units: 0
|
||||
channel: latest/edge
|
||||
channel: 2023.1/edge
|
||||
|
||||
nova-cloud-controller:
|
||||
charm: ch:nova-cloud-controller
|
||||
|
|
@ -140,7 +140,7 @@ applications:
|
|||
debug: true
|
||||
to:
|
||||
- '10'
|
||||
channel: latest/edge
|
||||
channel: 2023.1/edge
|
||||
|
||||
nova-cell-controller-cell2:
|
||||
charm: ../../../nova-cell-controller.charm
|
||||
|
|
@ -166,28 +166,28 @@ applications:
|
|||
debug: true
|
||||
to:
|
||||
- '12'
|
||||
channel: latest/edge
|
||||
channel: 2023.1/edge
|
||||
|
||||
rabbitmq-server-nova:
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
to:
|
||||
- '13'
|
||||
channel: latest/edge
|
||||
channel: 3.9/edge
|
||||
|
||||
rabbitmq-server-nova-cell2:
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
to:
|
||||
- '14'
|
||||
channel: latest/edge
|
||||
channel: 3.9/edge
|
||||
|
||||
rabbitmq-server-neutron:
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
to:
|
||||
- '15'
|
||||
channel: latest/edge
|
||||
channel: 3.9/edge
|
||||
|
||||
placement:
|
||||
charm: ch:placement
|
||||
|
|
@ -197,7 +197,7 @@ applications:
|
|||
debug: true
|
||||
to:
|
||||
- '16'
|
||||
channel: latest/edge
|
||||
channel: 2023.1/edge
|
||||
|
||||
relations:
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
setuptools < 50.0
|
||||
|
||||
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
|
||||
git+https://github.com/openstack/charms.openstack.git@stable/antelope#egg=charms.openstack
|
||||
|
||||
git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
|
||||
git+https://github.com/juju/charm-helpers.git@stable/antelope#egg=charmhelpers
|
||||
|
|
|
|||
|
|
@ -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/antelope#egg=charms.openstack
|
||||
#
|
||||
# Revisit for removal / mock improvement:
|
||||
#
|
||||
|
|
|
|||
Loading…
Reference in New Issue