Updates for stable branch creation
- Set default branch for git review/gerrit. - 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 Change-Id: Ic7b0d26815f3b6796017a0fecff556fab2d92ad9
This commit is contained in:
Alex Kavanagh
committed by
Liam Young
Liam Young
parent
88590b8d0f
commit
86cc530e33
@@ -2,3 +2,5 @@
|
||||
host=review.opendev.org
|
||||
port=29418
|
||||
project=openstack/charm-ironic-api.git
|
||||
|
||||
defaultbranch=stable/yoga
|
||||
|
||||
14
osci.yaml
14
osci.yaml
@@ -1,19 +1,9 @@
|
||||
- project:
|
||||
templates:
|
||||
- charm-unit-jobs-py38
|
||||
- charm-unit-jobs-py39
|
||||
# Non-voting due to:
|
||||
# https://bugs.launchpad.net/charm-ironic-conductor/+bug/1952140
|
||||
# - charm-xena-functional-jobs
|
||||
- charm-unit-jobs-py310
|
||||
- charm-xena-functional-jobs
|
||||
- charm-yoga-functional-jobs
|
||||
check:
|
||||
jobs:
|
||||
# Non-voting due to:
|
||||
# https://bugs.launchpad.net/charm-ironic-conductor/+bug/1952140
|
||||
- focal-xena:
|
||||
voting: false
|
||||
- impish-xena:
|
||||
voting: false
|
||||
vars:
|
||||
needs_charm_build: true
|
||||
charm_build_name: ironic-api
|
||||
|
||||
@@ -8,9 +8,16 @@
|
||||
# requirements.txt
|
||||
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
||||
|
||||
# NOTE: newer versions of cryptography require a Rust compiler to build,
|
||||
# see
|
||||
# * https://github.com/openstack-charmers/zaza/issues/421
|
||||
# * https://mail.python.org/pipermail/cryptography-dev/2021-January/001003.html
|
||||
#
|
||||
cryptography<3.4
|
||||
|
||||
# Build requirements
|
||||
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
|
||||
charm-tools==2.8.3
|
||||
git+https://github.com/juju/charm-tools#egg=charm-tools
|
||||
|
||||
simplejson
|
||||
|
||||
|
||||
238
src/build.lock
Normal file
238
src/build.lock
Normal file
@@ -0,0 +1,238 @@
|
||||
{
|
||||
"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": "fb767dcf0786d1d5364199bb3b40bdc86518b45b"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "layer:openstack",
|
||||
"url": "https://github.com/openstack/charm-layer-openstack",
|
||||
"vcs": null,
|
||||
"branch": "refs/heads/master",
|
||||
"commit": "e0f700eacb026235e1a04e7cbc28dfbe9d4e4520"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "layer:openstack-principle",
|
||||
"url": "https://github.com/openstack/charm-layer-openstack-principle",
|
||||
"vcs": null,
|
||||
"branch": "refs/heads/master",
|
||||
"commit": "2541283a7f9c3fa923c0fccd7257e217e11dadcd"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "layer:openstack-api",
|
||||
"url": "https://github.com/openstack/charm-layer-openstack-api",
|
||||
"vcs": null,
|
||||
"branch": "refs/heads/master",
|
||||
"commit": "34311a62e963d0ce903b7ddb9d70b8f071f71651"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "ironic-api",
|
||||
"url": null,
|
||||
"vcs": null,
|
||||
"branch": "refs/heads/review/alex_kavanagh/charm-release-2204",
|
||||
"commit": "refs/heads/review/alex_kavanagh/charm-release-2204"
|
||||
},
|
||||
{
|
||||
"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:mysql-shared",
|
||||
"url": "https://github.com/openstack/charm-interface-mysql-shared",
|
||||
"vcs": null,
|
||||
"branch": "refs/heads/master",
|
||||
"commit": "f90f8c6edce21e4da3a872f0f9d6761730ce025d"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "interface:rabbitmq",
|
||||
"url": "https://github.com/openstack/charm-interface-rabbitmq",
|
||||
"vcs": null,
|
||||
"branch": "refs/heads/master",
|
||||
"commit": "383121fc584d2d3bf9d233eba0d3708398a4c468"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "interface:keystone",
|
||||
"url": "https://github.com/openstack/charm-interface-keystone",
|
||||
"vcs": null,
|
||||
"branch": "refs/heads/master",
|
||||
"commit": "501af18b3036f5af92990bc39e750e76e393e5eb"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "interface:hacluster",
|
||||
"url": "https://github.com/openstack/charm-interface-hacluster.git",
|
||||
"vcs": null,
|
||||
"branch": "refs/heads/master",
|
||||
"commit": "2b714e90b1b8845ce7390bb1dad5a56a65437907"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "interface:openstack-ha",
|
||||
"url": "https://github.com/openstack/charm-interface-openstack-ha",
|
||||
"vcs": null,
|
||||
"branch": "refs/heads/master",
|
||||
"commit": "a3b00e5b5fd857d130698c5cfe4b918877f0ab80"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "interface:ironic-api",
|
||||
"url": "https://opendev.org/openstack/charm-interface-ironic-api.git",
|
||||
"vcs": null,
|
||||
"branch": "refs/heads/master",
|
||||
"commit": "945ba01c692be7a160eb92dce53b0f3dcd558441"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "pbr",
|
||||
"vcs": null,
|
||||
"version": "5.8.1"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "PyYAML",
|
||||
"vcs": null,
|
||||
"version": "5.3.1"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "pip",
|
||||
"vcs": null,
|
||||
"version": "22.0.4"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "packaging",
|
||||
"vcs": null,
|
||||
"version": "21.3"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "dnspython",
|
||||
"vcs": null,
|
||||
"version": "1.16.0"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "Jinja2",
|
||||
"vcs": null,
|
||||
"version": "3.1.1"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "pyparsing",
|
||||
"vcs": null,
|
||||
"version": "3.0.8"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "netifaces",
|
||||
"vcs": null,
|
||||
"version": "0.11.0"
|
||||
},
|
||||
{
|
||||
"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/yoga",
|
||||
"version": "13ef220ce3529fa7b8e11c6e4c5b352d05b6f148",
|
||||
"vcs": "git"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "flit_core",
|
||||
"vcs": null,
|
||||
"version": "3.7.1"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "MarkupSafe",
|
||||
"vcs": null,
|
||||
"version": "2.1.1"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "setuptools",
|
||||
"vcs": null,
|
||||
"version": "49.6.0"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "psutil",
|
||||
"vcs": null,
|
||||
"version": "5.9.0"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "wheel",
|
||||
"vcs": null,
|
||||
"version": "0.37.1"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "netaddr",
|
||||
"vcs": null,
|
||||
"version": "0.7.19"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "setuptools_scm",
|
||||
"vcs": null,
|
||||
"version": "6.4.2"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "pyaml",
|
||||
"vcs": null,
|
||||
"version": "21.10.1"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "charms.reactive",
|
||||
"vcs": null,
|
||||
"version": "1.5.0"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "charmhelpers",
|
||||
"url": "git+https://github.com/juju/charm-helpers.git",
|
||||
"branch": "refs/heads/stable/yoga",
|
||||
"version": "971ac5117c96bd1cb4a6a520787e4509564da582",
|
||||
"vcs": "git"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "tomli",
|
||||
"vcs": null,
|
||||
"version": "2.0.1"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -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/yoga#egg=zaza
|
||||
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/yoga#egg=zaza.openstack
|
||||
|
||||
@@ -139,38 +139,38 @@ relations:
|
||||
services:
|
||||
nova-cloud-controller-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: 8.0.19/edge
|
||||
keystone-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: 8.0.19/edge
|
||||
glance-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: 8.0.19/edge
|
||||
neutron-api-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: 8.0.19/edge
|
||||
placement-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: 8.0.19/edge
|
||||
vault-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: 8.0.19/edge
|
||||
cinder-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: 8.0.19/edge
|
||||
ironic-api-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: 8.0.19/edge
|
||||
ironic-conductor-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: 8.0.19/edge
|
||||
mysql-innodb-cluster:
|
||||
charm: ch:mysql-innodb-cluster
|
||||
num_units: 3
|
||||
constraints: mem=4G
|
||||
options:
|
||||
source: *source
|
||||
channel: latest/edge
|
||||
channel: 8.0.19/edge
|
||||
cinder:
|
||||
charm: ch:cinder
|
||||
num_units: 1
|
||||
@@ -182,7 +182,7 @@ services:
|
||||
worker-multiplier: 0.25
|
||||
storage:
|
||||
block-devices: cinder,50G
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
ceph-radosgw:
|
||||
charm: ch:ceph-radosgw
|
||||
num_units: 1
|
||||
@@ -190,7 +190,7 @@ services:
|
||||
options:
|
||||
source: *source
|
||||
namespace-tenants: True
|
||||
channel: latest/edge
|
||||
channel: quincy/edge
|
||||
ceph-mon:
|
||||
charm: ch:ceph-mon
|
||||
num_units: 3
|
||||
@@ -198,7 +198,7 @@ services:
|
||||
options:
|
||||
expected-osd-count: 3
|
||||
source: *source
|
||||
channel: latest/edge
|
||||
channel: quincy/edge
|
||||
ceph-osd:
|
||||
charm: ch:ceph-osd
|
||||
num_units: 3
|
||||
@@ -207,7 +207,7 @@ services:
|
||||
source: *source
|
||||
storage:
|
||||
osd-devices: 'cinder,30G'
|
||||
channel: latest/edge
|
||||
channel: quincy/edge
|
||||
glance:
|
||||
charm: ch:glance
|
||||
num_units: 1
|
||||
@@ -215,7 +215,7 @@ services:
|
||||
options:
|
||||
openstack-origin: *source
|
||||
worker-multiplier: 0.25
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
keystone:
|
||||
charm: ch:keystone
|
||||
num_units: 1
|
||||
@@ -223,7 +223,7 @@ services:
|
||||
options:
|
||||
openstack-origin: *source
|
||||
worker-multiplier: 0.25
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
neutron-api:
|
||||
charm: ch:neutron-api
|
||||
num_units: 1
|
||||
@@ -234,7 +234,7 @@ services:
|
||||
openstack-origin: *source
|
||||
manage-neutron-plugin-legacy-mode: false
|
||||
worker-multiplier: 0.25
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
neutron-gateway:
|
||||
charm: ch:neutron-gateway
|
||||
num_units: 1
|
||||
@@ -244,7 +244,7 @@ services:
|
||||
enable-isolated-metadata: true
|
||||
enable-metadata-network: true
|
||||
bridge-mappings: physnet1:br-ex
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
nova-cloud-controller:
|
||||
charm: ch:nova-cloud-controller
|
||||
num_units: 1
|
||||
@@ -253,7 +253,7 @@ services:
|
||||
network-manager: Neutron
|
||||
openstack-origin: *source
|
||||
worker-multiplier: 0.25
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
nova-ironic:
|
||||
charm: ch:nova-compute
|
||||
num_units: 1
|
||||
@@ -263,7 +263,7 @@ services:
|
||||
enable-resize: false
|
||||
openstack-origin: *source
|
||||
virt-type: ironic
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
placement:
|
||||
charm: ch:placement
|
||||
num_units: 1
|
||||
@@ -271,7 +271,7 @@ services:
|
||||
options:
|
||||
openstack-origin: *source
|
||||
worker-multiplier: 0.25
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
rabbitmq-server:
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
@@ -297,20 +297,20 @@ services:
|
||||
disable-secure-erase: true
|
||||
use-ipxe: true
|
||||
enabled-network-interfaces: "flat, noop"
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
neutron-openvswitch:
|
||||
charm: ch:neutron-openvswitch
|
||||
num_units: 0
|
||||
options:
|
||||
bridge-mappings: physnet1:br-ex
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
neutron-ironic-agent:
|
||||
charm: ch:neutron-api-plugin-ironic
|
||||
num_units: 0
|
||||
options:
|
||||
openstack-origin: *source
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
vault:
|
||||
charm: ch:vault
|
||||
num_units: 1
|
||||
channel: latest/edge
|
||||
channel: 1.7/edge
|
||||
|
||||
@@ -139,38 +139,38 @@ relations:
|
||||
services:
|
||||
nova-cloud-controller-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: 8.0.19/edge
|
||||
keystone-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: 8.0.19/edge
|
||||
glance-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: 8.0.19/edge
|
||||
neutron-api-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: 8.0.19/edge
|
||||
placement-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: 8.0.19/edge
|
||||
vault-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: 8.0.19/edge
|
||||
cinder-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: 8.0.19/edge
|
||||
ironic-api-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: 8.0.19/edge
|
||||
ironic-conductor-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: 8.0.19/edge
|
||||
mysql-innodb-cluster:
|
||||
charm: ch:mysql-innodb-cluster
|
||||
num_units: 3
|
||||
constraints: mem=4G
|
||||
options:
|
||||
source: *source
|
||||
channel: latest/edge
|
||||
channel: 8.0.19/edge
|
||||
cinder:
|
||||
charm: ch:cinder
|
||||
num_units: 1
|
||||
@@ -182,7 +182,7 @@ services:
|
||||
worker-multiplier: 0.25
|
||||
storage:
|
||||
block-devices: cinder,50G
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
ceph-radosgw:
|
||||
charm: ch:ceph-radosgw
|
||||
num_units: 1
|
||||
@@ -190,7 +190,7 @@ services:
|
||||
options:
|
||||
source: *source
|
||||
namespace-tenants: True
|
||||
channel: latest/edge
|
||||
channel: quincy/edge
|
||||
ceph-mon:
|
||||
charm: ch:ceph-mon
|
||||
num_units: 3
|
||||
@@ -198,7 +198,7 @@ services:
|
||||
options:
|
||||
expected-osd-count: 3
|
||||
source: *source
|
||||
channel: latest/edge
|
||||
channel: quincy/edge
|
||||
ceph-osd:
|
||||
charm: ch:ceph-osd
|
||||
num_units: 3
|
||||
@@ -207,7 +207,7 @@ services:
|
||||
source: *source
|
||||
storage:
|
||||
osd-devices: 'cinder,30G'
|
||||
channel: latest/edge
|
||||
channel: quincy/edge
|
||||
glance:
|
||||
charm: ch:glance
|
||||
num_units: 1
|
||||
@@ -215,7 +215,7 @@ services:
|
||||
options:
|
||||
openstack-origin: *source
|
||||
worker-multiplier: 0.25
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
keystone:
|
||||
charm: ch:keystone
|
||||
num_units: 1
|
||||
@@ -223,7 +223,7 @@ services:
|
||||
options:
|
||||
openstack-origin: *source
|
||||
worker-multiplier: 0.25
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
neutron-api:
|
||||
charm: ch:neutron-api
|
||||
num_units: 1
|
||||
@@ -234,7 +234,7 @@ services:
|
||||
openstack-origin: *source
|
||||
manage-neutron-plugin-legacy-mode: false
|
||||
worker-multiplier: 0.25
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
neutron-gateway:
|
||||
charm: ch:neutron-gateway
|
||||
num_units: 1
|
||||
@@ -244,7 +244,7 @@ services:
|
||||
enable-isolated-metadata: true
|
||||
enable-metadata-network: true
|
||||
bridge-mappings: physnet1:br-ex
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
nova-cloud-controller:
|
||||
charm: ch:nova-cloud-controller
|
||||
num_units: 1
|
||||
@@ -253,7 +253,7 @@ services:
|
||||
network-manager: Neutron
|
||||
openstack-origin: *source
|
||||
worker-multiplier: 0.25
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
nova-ironic:
|
||||
charm: ch:nova-compute
|
||||
num_units: 1
|
||||
@@ -263,7 +263,7 @@ services:
|
||||
enable-resize: false
|
||||
openstack-origin: *source
|
||||
virt-type: ironic
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
placement:
|
||||
charm: ch:placement
|
||||
num_units: 1
|
||||
@@ -271,7 +271,7 @@ services:
|
||||
options:
|
||||
openstack-origin: *source
|
||||
worker-multiplier: 0.25
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
rabbitmq-server:
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
@@ -297,20 +297,20 @@ services:
|
||||
disable-secure-erase: true
|
||||
use-ipxe: true
|
||||
enabled-network-interfaces: "flat, noop"
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
neutron-openvswitch:
|
||||
charm: ch:neutron-openvswitch
|
||||
num_units: 0
|
||||
options:
|
||||
bridge-mappings: physnet1:br-ex
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
neutron-ironic-agent:
|
||||
charm: ch:neutron-api-plugin-ironic
|
||||
num_units: 0
|
||||
options:
|
||||
openstack-origin: *source
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
vault:
|
||||
charm: ch:vault
|
||||
num_units: 1
|
||||
channel: latest/edge
|
||||
channel: 1.7/edge
|
||||
|
||||
@@ -1,316 +0,0 @@
|
||||
local_overlay_enabled: False
|
||||
|
||||
options:
|
||||
source: &source distro
|
||||
series: impish
|
||||
relations:
|
||||
- - nova-ironic
|
||||
- ironic-api
|
||||
- - ironic-conductor
|
||||
- ironic-api
|
||||
- - neutron-ironic-agent:identity-credentials
|
||||
- keystone
|
||||
- - neutron-ironic-agent
|
||||
- neutron-api
|
||||
- - neutron-openvswitch
|
||||
- neutron-api
|
||||
- - neutron-openvswitch
|
||||
- nova-ironic
|
||||
- - neutron-openvswitch:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - ironic-api:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - ironic-api
|
||||
- keystone
|
||||
- - ironic-api:shared-db
|
||||
- ironic-api-mysql-router:shared-db
|
||||
- - ironic-conductor:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - ironic-conductor
|
||||
- keystone
|
||||
- - ironic-conductor:shared-db
|
||||
- ironic-conductor-mysql-router:shared-db
|
||||
- - nova-ironic:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - nova-ironic
|
||||
- glance
|
||||
- - nova-ironic
|
||||
- keystone
|
||||
- - nova-ironic
|
||||
- nova-cloud-controller
|
||||
- - neutron-gateway:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - keystone:shared-db
|
||||
- keystone-mysql-router:shared-db
|
||||
- - nova-cloud-controller:identity-service
|
||||
- keystone:identity-service
|
||||
- - glance:identity-service
|
||||
- keystone:identity-service
|
||||
- - neutron-api:identity-service
|
||||
- keystone:identity-service
|
||||
- - neutron-api:shared-db
|
||||
- neutron-api-mysql-router:shared-db
|
||||
- - neutron-api:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - neutron-gateway:neutron-plugin-api
|
||||
- neutron-api:neutron-plugin-api
|
||||
- - glance:shared-db
|
||||
- glance-mysql-router:shared-db
|
||||
- - glance:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - nova-cloud-controller:image-service
|
||||
- glance:image-service
|
||||
- - nova-cloud-controller:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - nova-cloud-controller:quantum-network-service
|
||||
- neutron-gateway:quantum-network-service
|
||||
- - nova-cloud-controller:shared-db
|
||||
- nova-cloud-controller-mysql-router:shared-db
|
||||
- - nova-cloud-controller:neutron-api
|
||||
- neutron-api:neutron-api
|
||||
- - cinder:image-service
|
||||
- glance:image-service
|
||||
- - cinder:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - cinder:identity-service
|
||||
- keystone:identity-service
|
||||
- - cinder:cinder-volume-service
|
||||
- nova-cloud-controller:cinder-volume-service
|
||||
- - cinder:shared-db
|
||||
- cinder-mysql-router:shared-db
|
||||
- - placement:shared-db
|
||||
- placement-mysql-router:shared-db
|
||||
- - placement
|
||||
- keystone
|
||||
- - placement
|
||||
- nova-cloud-controller
|
||||
- - ceph-mon:client
|
||||
- nova-ironic:ceph
|
||||
- - ceph-mon:client
|
||||
- glance:ceph
|
||||
- - ceph-radosgw:mon
|
||||
- ceph-mon:radosgw
|
||||
- - ceph-radosgw:identity-service
|
||||
- keystone:identity-service
|
||||
- - ceph-osd:mon
|
||||
- ceph-mon:osd
|
||||
- - ceph-radosgw:object-store
|
||||
- glance
|
||||
- - mysql-innodb-cluster:db-router
|
||||
- nova-cloud-controller-mysql-router:db-router
|
||||
- - mysql-innodb-cluster:db-router
|
||||
- keystone-mysql-router:db-router
|
||||
- - mysql-innodb-cluster:db-router
|
||||
- glance-mysql-router:db-router
|
||||
- - mysql-innodb-cluster:db-router
|
||||
- neutron-api-mysql-router:db-router
|
||||
- - mysql-innodb-cluster:db-router
|
||||
- placement-mysql-router:db-router
|
||||
- - mysql-innodb-cluster:db-router
|
||||
- cinder-mysql-router:db-router
|
||||
- - mysql-innodb-cluster:db-router
|
||||
- ironic-api-mysql-router:db-router
|
||||
- - mysql-innodb-cluster:db-router
|
||||
- ironic-conductor-mysql-router:db-router
|
||||
- - vault-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - vault:shared-db
|
||||
- vault-mysql-router:shared-db
|
||||
- - vault:certificates
|
||||
- ceph-radosgw
|
||||
- - vault:certificates
|
||||
- cinder
|
||||
- - vault:certificates
|
||||
- glance:certificates
|
||||
- - vault:certificates
|
||||
- keystone:certificates
|
||||
- - vault:certificates
|
||||
- neutron-api:certificates
|
||||
- - vault:certificates
|
||||
- nova-cloud-controller:certificates
|
||||
- - vault:certificates
|
||||
- placement:certificates
|
||||
- - vault
|
||||
- ironic-conductor
|
||||
- - vault:certificates
|
||||
- ironic-api:certificates
|
||||
- - ironic-api
|
||||
- hacluster-ironic
|
||||
services:
|
||||
nova-cloud-controller-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
keystone-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
glance-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
neutron-api-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
placement-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
vault-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
cinder-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
ironic-api-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
ironic-conductor-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
mysql-innodb-cluster:
|
||||
charm: ch:mysql-innodb-cluster
|
||||
num_units: 3
|
||||
constraints: mem=4G
|
||||
options:
|
||||
source: *source
|
||||
channel: latest/edge
|
||||
cinder:
|
||||
charm: ch:cinder
|
||||
num_units: 1
|
||||
constraints: mem=2G
|
||||
options:
|
||||
block-device: vdb
|
||||
glance-api-version: 2
|
||||
openstack-origin: *source
|
||||
worker-multiplier: 0.25
|
||||
storage:
|
||||
block-devices: cinder,50G
|
||||
channel: latest/edge
|
||||
ceph-radosgw:
|
||||
charm: ch:ceph-radosgw
|
||||
num_units: 1
|
||||
constraints: mem=2G
|
||||
options:
|
||||
source: *source
|
||||
namespace-tenants: True
|
||||
channel: latest/edge
|
||||
ceph-mon:
|
||||
charm: ch:ceph-mon
|
||||
num_units: 3
|
||||
constraints: mem=2G
|
||||
options:
|
||||
expected-osd-count: 3
|
||||
source: *source
|
||||
channel: latest/edge
|
||||
ceph-osd:
|
||||
charm: ch:ceph-osd
|
||||
num_units: 3
|
||||
constraints: mem=2G
|
||||
options:
|
||||
source: *source
|
||||
storage:
|
||||
osd-devices: 'cinder,30G'
|
||||
channel: latest/edge
|
||||
glance:
|
||||
charm: ch:glance
|
||||
num_units: 1
|
||||
constraints: mem=2G
|
||||
options:
|
||||
openstack-origin: *source
|
||||
worker-multiplier: 0.25
|
||||
channel: latest/edge
|
||||
keystone:
|
||||
charm: ch:keystone
|
||||
num_units: 1
|
||||
constraints: mem=2G
|
||||
options:
|
||||
openstack-origin: *source
|
||||
worker-multiplier: 0.25
|
||||
channel: latest/edge
|
||||
neutron-api:
|
||||
charm: ch:neutron-api
|
||||
num_units: 1
|
||||
constraints: mem=2G
|
||||
options:
|
||||
flat-network-providers: "physnet1"
|
||||
neutron-security-groups: true
|
||||
openstack-origin: *source
|
||||
manage-neutron-plugin-legacy-mode: false
|
||||
worker-multiplier: 0.25
|
||||
channel: latest/edge
|
||||
neutron-gateway:
|
||||
charm: ch:neutron-gateway
|
||||
num_units: 1
|
||||
constraints: mem=2G
|
||||
options:
|
||||
openstack-origin: *source
|
||||
enable-isolated-metadata: true
|
||||
enable-metadata-network: true
|
||||
bridge-mappings: physnet1:br-ex
|
||||
channel: latest/edge
|
||||
nova-cloud-controller:
|
||||
charm: ch:nova-cloud-controller
|
||||
num_units: 1
|
||||
constraints: mem=2G
|
||||
options:
|
||||
network-manager: Neutron
|
||||
openstack-origin: *source
|
||||
worker-multiplier: 0.25
|
||||
channel: latest/edge
|
||||
nova-ironic:
|
||||
charm: ch:nova-compute
|
||||
num_units: 1
|
||||
constraints: mem=2G
|
||||
options:
|
||||
enable-live-migration: false
|
||||
enable-resize: false
|
||||
openstack-origin: *source
|
||||
virt-type: ironic
|
||||
channel: latest/edge
|
||||
placement:
|
||||
charm: ch:placement
|
||||
num_units: 1
|
||||
constraints: mem=2G
|
||||
options:
|
||||
openstack-origin: *source
|
||||
worker-multiplier: 0.25
|
||||
channel: latest/edge
|
||||
rabbitmq-server:
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
constraints: mem=2G
|
||||
channel: latest/edge
|
||||
hacluster-ironic:
|
||||
charm: ch:hacluster
|
||||
num_units: 0
|
||||
channel: latest/edge
|
||||
ironic-api:
|
||||
charm: ../../../ironic-api.charm
|
||||
num_units: 3
|
||||
constraints: mem=2G
|
||||
options:
|
||||
openstack-origin: *source
|
||||
ironic-conductor:
|
||||
charm: ch:ironic-conductor
|
||||
num_units: 1
|
||||
constraints: mem=2G
|
||||
options:
|
||||
openstack-origin: *source
|
||||
max-tftp-block-size: 1418
|
||||
disable-secure-erase: true
|
||||
use-ipxe: true
|
||||
enabled-network-interfaces: "flat, noop"
|
||||
channel: latest/edge
|
||||
neutron-openvswitch:
|
||||
charm: ch:neutron-openvswitch
|
||||
num_units: 0
|
||||
options:
|
||||
bridge-mappings: physnet1:br-ex
|
||||
channel: latest/edge
|
||||
neutron-ironic-agent:
|
||||
charm: ch:neutron-api-plugin-ironic
|
||||
num_units: 0
|
||||
options:
|
||||
openstack-origin: *source
|
||||
channel: latest/edge
|
||||
vault:
|
||||
charm: ch:vault
|
||||
num_units: 1
|
||||
channel: latest/edge
|
||||
@@ -182,7 +182,7 @@ services:
|
||||
worker-multiplier: 0.25
|
||||
storage:
|
||||
block-devices: cinder,50G
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
ceph-radosgw:
|
||||
charm: ch:ceph-radosgw
|
||||
num_units: 1
|
||||
@@ -190,7 +190,7 @@ services:
|
||||
options:
|
||||
source: *source
|
||||
namespace-tenants: True
|
||||
channel: latest/edge
|
||||
channel: quincy/edge
|
||||
ceph-mon:
|
||||
charm: ch:ceph-mon
|
||||
num_units: 3
|
||||
@@ -198,7 +198,7 @@ services:
|
||||
options:
|
||||
expected-osd-count: 3
|
||||
source: *source
|
||||
channel: latest/edge
|
||||
channel: quincy/edge
|
||||
ceph-osd:
|
||||
charm: ch:ceph-osd
|
||||
num_units: 3
|
||||
@@ -207,7 +207,7 @@ services:
|
||||
source: *source
|
||||
storage:
|
||||
osd-devices: 'cinder,30G'
|
||||
channel: latest/edge
|
||||
channel: quincy/edge
|
||||
glance:
|
||||
charm: ch:glance
|
||||
num_units: 1
|
||||
@@ -215,7 +215,7 @@ services:
|
||||
options:
|
||||
openstack-origin: *source
|
||||
worker-multiplier: 0.25
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
keystone:
|
||||
charm: ch:keystone
|
||||
num_units: 1
|
||||
@@ -223,7 +223,7 @@ services:
|
||||
options:
|
||||
openstack-origin: *source
|
||||
worker-multiplier: 0.25
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
neutron-api:
|
||||
charm: ch:neutron-api
|
||||
num_units: 1
|
||||
@@ -234,7 +234,7 @@ services:
|
||||
openstack-origin: *source
|
||||
manage-neutron-plugin-legacy-mode: false
|
||||
worker-multiplier: 0.25
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
neutron-gateway:
|
||||
charm: ch:neutron-gateway
|
||||
num_units: 1
|
||||
@@ -244,7 +244,7 @@ services:
|
||||
enable-isolated-metadata: true
|
||||
enable-metadata-network: true
|
||||
bridge-mappings: physnet1:br-ex
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
nova-cloud-controller:
|
||||
charm: ch:nova-cloud-controller
|
||||
num_units: 1
|
||||
@@ -253,7 +253,7 @@ services:
|
||||
network-manager: Neutron
|
||||
openstack-origin: *source
|
||||
worker-multiplier: 0.25
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
nova-ironic:
|
||||
charm: ch:nova-compute
|
||||
num_units: 1
|
||||
@@ -263,7 +263,7 @@ services:
|
||||
enable-resize: false
|
||||
openstack-origin: *source
|
||||
virt-type: ironic
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
placement:
|
||||
charm: ch:placement
|
||||
num_units: 1
|
||||
@@ -271,7 +271,7 @@ services:
|
||||
options:
|
||||
openstack-origin: *source
|
||||
worker-multiplier: 0.25
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
rabbitmq-server:
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
@@ -297,20 +297,20 @@ services:
|
||||
disable-secure-erase: true
|
||||
use-ipxe: true
|
||||
enabled-network-interfaces: "flat, noop"
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
neutron-openvswitch:
|
||||
charm: ch:neutron-openvswitch
|
||||
num_units: 0
|
||||
options:
|
||||
bridge-mappings: physnet1:br-ex
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
neutron-ironic-agent:
|
||||
charm: ch:neutron-api-plugin-ironic
|
||||
num_units: 0
|
||||
options:
|
||||
openstack-origin: *source
|
||||
channel: latest/edge
|
||||
channel: yoga/edge
|
||||
vault:
|
||||
charm: ch:vault
|
||||
num_units: 1
|
||||
channel: latest/edge
|
||||
channel: 1.7/edge
|
||||
|
||||
@@ -2,7 +2,6 @@ charm_name: ironic-api
|
||||
|
||||
gate_bundles:
|
||||
- focal-xena
|
||||
- impish-xena
|
||||
|
||||
dev_bundles:
|
||||
- focal-yoga
|
||||
@@ -36,5 +35,4 @@ tests:
|
||||
|
||||
tests_options:
|
||||
force_deploy:
|
||||
- impish-xena
|
||||
- jammy-yoga
|
||||
|
||||
@@ -1,4 +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/yoga#egg=charms.openstack
|
||||
|
||||
git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
|
||||
git+https://github.com/juju/charm-helpers.git@stable/yoga#egg=charmhelpers
|
||||
|
||||
@@ -35,7 +35,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/yoga#egg=charms.openstack
|
||||
#
|
||||
# Revisit for removal / mock improvement:
|
||||
#
|
||||
|
||||
Reference in New Issue
Block a user