Charmhub migration for stable/train (bionic-only)
This is the main patch for the migration of the stable/21.10 charm to charmhub for the stable/train branch (train track on charmhub). This patch initially supports bionic from queens to train, and does not support ussuri. It supports upgrades from bionic-queens to bionic-train (with each intermediate step needed). Crucially it does NOT set a default openstack-origin, which means installing train/stable without specifying the openstack-origin will result in a bionic-queens installation. This is intentional as the branch covers queens to train. Change-Id: I6e574ff05df1e61752a1997ec11e8ade39b1a809
This commit is contained in:
parent
6e056ea44f
commit
a12f3749fd
|
@ -13,3 +13,4 @@ interfaces
|
|||
layers
|
||||
.idea
|
||||
.history
|
||||
*.charm
|
||||
|
|
|
@ -3,4 +3,4 @@ host=review.opendev.org
|
|||
port=29418
|
||||
project=openstack/charm-gnocchi.git
|
||||
|
||||
defaultbranch=stable/21.10
|
||||
defaultbranch=stable/train
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
- project:
|
||||
templates:
|
||||
- openstack-python3-ussuri-jobs
|
||||
# note that this requires tox-py36 and tox-py37 targets
|
||||
- openstack-python3-train-jobs
|
||||
- openstack-cover-jobs
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
# NOTES(lourot):
|
||||
# * We don't install charmcraft via pip anymore because it anyway spins up a
|
||||
# container and scp the system's charmcraft snap inside it. So the charmcraft
|
||||
# snap is necessary on the system anyway.
|
||||
# * `tox -e build` successfully validated with charmcraft 1.2.1
|
||||
|
||||
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
|
|
@ -0,0 +1,32 @@
|
|||
type: charm
|
||||
|
||||
parts:
|
||||
charm:
|
||||
build-packages:
|
||||
- git
|
||||
- python3-dev
|
||||
- python3-pip
|
||||
- python3-pip
|
||||
override-build: |
|
||||
apt-get install ca-certificates -y
|
||||
pip3 install --user "tox==3.18"
|
||||
~/.local/bin/tox -e build-reactive
|
||||
override-stage: |
|
||||
echo "Copying charm to staging area: $CHARMCRAFT_STAGE"
|
||||
NAME=$(ls $CHARMCRAFT_PART_BUILD/build/builds)
|
||||
cp -r $CHARMCRAFT_PART_BUILD/build/builds/$NAME/* $CHARMCRAFT_STAGE/
|
||||
override-prime: |
|
||||
# For some reason, the normal priming chokes on the fact that there's a
|
||||
# hooks directory.
|
||||
cp -r $CHARMCRAFT_STAGE/* .
|
||||
|
||||
bases:
|
||||
- build-on:
|
||||
- name: ubuntu
|
||||
channel: "18.04"
|
||||
architectures:
|
||||
- amd64
|
||||
run-on:
|
||||
- name: ubuntu
|
||||
channel: "18.04"
|
||||
architectures: [amd64, s390x, ppc64el, arm64]
|
|
@ -0,0 +1 @@
|
|||
src/metadata.yaml
|
89
osci.yaml
89
osci.yaml
|
@ -1,95 +1,34 @@
|
|||
- project:
|
||||
templates:
|
||||
- charm-unit-jobs
|
||||
- charm-unit-jobs-py36
|
||||
- charm-queens-functional-jobs
|
||||
- charm-rocky-functional-jobs
|
||||
- charm-stein-functional-jobs
|
||||
- charm-train-functional-jobs
|
||||
check:
|
||||
jobs:
|
||||
- bionic-queens
|
||||
- bionic-stein
|
||||
- bionic-train
|
||||
- bionic-ussuri
|
||||
- focal-ussuri
|
||||
- focal-victoria
|
||||
- focal-wallaby
|
||||
- focal-xena:
|
||||
voting: false
|
||||
- groovy-victoria
|
||||
- hirsute-wallaby
|
||||
- impish-xena:
|
||||
voting: false
|
||||
- test-s3-bionic-stein-s3
|
||||
- test-s3-bionic-train-s3
|
||||
- test-s3-bionic-ussuri-s3
|
||||
- test-s3-focal-ussuri-s3
|
||||
- test-s3-focal-victoria-s3
|
||||
- test-s3-focal-wallaby-s3
|
||||
- test-s3-focal-xena-s3:
|
||||
voting: false
|
||||
- test-s3-groovy-victoria-s3
|
||||
- test-s3-hirsute-wallaby-s3
|
||||
- test-s3-impish-xena-s3:
|
||||
voting: false
|
||||
vars:
|
||||
needs_charm_build: true
|
||||
charm_build_name: gnocchi
|
||||
build_type: charmcraft
|
||||
|
||||
- job:
|
||||
name: test-s3-bionic-stein-s3
|
||||
parent: func-target
|
||||
dependencies: &smoke-jobs
|
||||
- focal-ussuri
|
||||
dependencies:
|
||||
- charm-build
|
||||
- osci-lint
|
||||
- tox-py36
|
||||
vars:
|
||||
tox_extra_args: test-s3:bionic-stein-s3
|
||||
- job:
|
||||
name: test-s3-bionic-train-s3
|
||||
parent: func-target
|
||||
dependencies: *smoke-jobs
|
||||
dependencies:
|
||||
- charm-build
|
||||
- osci-lint
|
||||
- tox-py36
|
||||
vars:
|
||||
tox_extra_args: test-s3:bionic-train-s3
|
||||
- job:
|
||||
name: test-s3-bionic-ussuri-s3
|
||||
parent: func-target
|
||||
dependencies: *smoke-jobs
|
||||
vars:
|
||||
tox_extra_args: test-s3:bionic-ussuri-s3
|
||||
- job:
|
||||
name: test-s3-focal-ussuri-s3
|
||||
parent: func-target
|
||||
dependencies: *smoke-jobs
|
||||
vars:
|
||||
tox_extra_args: test-s3:focal-ussuri-s3
|
||||
- job:
|
||||
name: test-s3-focal-victoria-s3
|
||||
parent: func-target
|
||||
dependencies: *smoke-jobs
|
||||
vars:
|
||||
tox_extra_args: test-s3:focal-victoria-s3
|
||||
- job:
|
||||
name: test-s3-focal-wallaby-s3
|
||||
parent: func-target
|
||||
dependencies: *smoke-jobs
|
||||
vars:
|
||||
tox_extra_args: test-s3:focal-wallaby-s3
|
||||
- job:
|
||||
name: test-s3-focal-xena-s3
|
||||
parent: func-target
|
||||
dependencies: *smoke-jobs
|
||||
vars:
|
||||
tox_extra_args: test-s3:focal-xena-s3
|
||||
- job:
|
||||
name: test-s3-groovy-victoria-s3
|
||||
parent: func-target
|
||||
dependencies: *smoke-jobs
|
||||
vars:
|
||||
tox_extra_args: test-s3:groovy-victoria-s3
|
||||
- job:
|
||||
name: test-s3-hirsute-wallaby-s3
|
||||
parent: func-target
|
||||
dependencies: *smoke-jobs
|
||||
vars:
|
||||
tox_extra_args: test-s3:hirsute-wallaby-s3
|
||||
- job:
|
||||
name: test-s3-impish-xena-s3
|
||||
parent: func-target
|
||||
dependencies: *smoke-jobs
|
||||
vars:
|
||||
tox_extra_args: test-s3:impish-xena-s3
|
||||
|
|
|
@ -0,0 +1,13 @@
|
|||
#!/bin/bash
|
||||
charm=$(grep "charm_build_name" osci.yaml | awk '{print $2}')
|
||||
echo "renaming ${charm}_*.charm to ${charm}.charm"
|
||||
echo -n "pwd: "
|
||||
pwd
|
||||
ls -al
|
||||
echo "Removing bad downloaded charm maybe?"
|
||||
if [[ -e "${charm}.charm" ]];
|
||||
then
|
||||
rm "${charm}.charm"
|
||||
fi
|
||||
echo "Renaming charm here."
|
||||
mv ${charm}_*.charm ${charm}.charm
|
|
@ -9,6 +9,7 @@
|
|||
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
||||
|
||||
# Build requirements
|
||||
pyparsing<3.0.0 # cffi needs pyparsing < 3.0.0.
|
||||
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
|
||||
charm-tools==2.8.3
|
||||
|
||||
|
|
|
@ -204,17 +204,11 @@
|
|||
"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",
|
||||
"branch": "stable/train",
|
||||
"version": "10627ee5f991c268f174d6d100e218a0e1867af1",
|
||||
"vcs": "git"
|
||||
},
|
||||
|
@ -240,8 +234,8 @@
|
|||
"type": "python_module",
|
||||
"package": "charmhelpers",
|
||||
"url": "git+https://github.com/juju/charm-helpers.git",
|
||||
"branch": "refs/heads/stable/21.10",
|
||||
"version": "26efcd0da51d580f68ead2ca13c38f58766f8a14",
|
||||
"branch": "stable/train",
|
||||
"version": "13fc2babe1999df87aaf149c549d8140289837a3",
|
||||
"vcs": "git"
|
||||
},
|
||||
{
|
||||
|
@ -269,4 +263,4 @@
|
|||
"version": "1.26.7"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
|
@ -10,12 +10,7 @@ description: |
|
|||
tags:
|
||||
- openstack
|
||||
series:
|
||||
- xenial
|
||||
- bionic
|
||||
- focal
|
||||
- groovy
|
||||
- hirsute
|
||||
- impish
|
||||
provides:
|
||||
metric-service:
|
||||
interface: gnocchi
|
||||
|
|
|
@ -5,5 +5,9 @@
|
|||
#
|
||||
|
||||
# Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
|
||||
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
|
||||
git+https://github.com/openstack-charmers/zaza.git@stable/train#egg=zaza
|
||||
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/train#egg=zaza.openstack
|
||||
|
||||
# Need tox to be available from tox... inception yes, but its a workaround for now
|
||||
tox
|
||||
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
local_overlay_enabled: False
|
||||
|
||||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
|
@ -22,35 +24,39 @@ machines:
|
|||
# time, given that machine "0" comes up way before machine "6"
|
||||
applications:
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
charm: ch:percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
channel: 5.7/edge
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '1'
|
||||
channel: 3.6/edge
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
charm: ch:keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '2'
|
||||
channel: train/edge
|
||||
ceilometer:
|
||||
charm: cs:~openstack-charmers/ceilometer
|
||||
charm: ch:ceilometer
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
channel: train/edge
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers/ceph-osd
|
||||
charm: ch:ceph-osd
|
||||
num_units: 3
|
||||
storage:
|
||||
osd-devices: 'cinder,10G'
|
||||
|
@ -60,8 +66,9 @@ applications:
|
|||
- '4'
|
||||
- '5'
|
||||
- '6'
|
||||
channel: nautilus/edge
|
||||
ceph-mon:
|
||||
charm: cs:~openstack-charmers/ceph-mon
|
||||
charm: ch:ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
expected-osd-count: 3
|
||||
|
@ -71,16 +78,17 @@ applications:
|
|||
- '7'
|
||||
- '8'
|
||||
- '9'
|
||||
channel: nautilus/edge
|
||||
gnocchi:
|
||||
series: *series
|
||||
charm: ../../../gnocchi
|
||||
charm: ../../../gnocchi.charm
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '10'
|
||||
memcached:
|
||||
charm: cs:~memcached-team/memcached
|
||||
charm: ch:memcached
|
||||
num_units: 1
|
||||
to:
|
||||
- '11'
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
local_overlay_enabled: False
|
||||
|
||||
variables:
|
||||
openstack-origin: &openstack-origin cloud:bionic-rocky
|
||||
|
||||
|
@ -22,35 +24,39 @@ machines:
|
|||
# time, given that machine "0" comes up way before machine "6"
|
||||
applications:
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
charm: ch:percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
channel: 5.7/edge
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '1'
|
||||
channel: 3.6/edge
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
charm: ch:keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '2'
|
||||
channel: train/edge
|
||||
ceilometer:
|
||||
charm: cs:~openstack-charmers/ceilometer
|
||||
charm: ch:ceilometer
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
channel: train/edge
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers/ceph-osd
|
||||
charm: ch:ceph-osd
|
||||
num_units: 3
|
||||
storage:
|
||||
osd-devices: 'cinder,10G'
|
||||
|
@ -60,8 +66,9 @@ applications:
|
|||
- '4'
|
||||
- '5'
|
||||
- '6'
|
||||
channel: nautilus/edge
|
||||
ceph-mon:
|
||||
charm: cs:~openstack-charmers/ceph-mon
|
||||
charm: ch:ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
expected-osd-count: 3
|
||||
|
@ -71,16 +78,17 @@ applications:
|
|||
- '7'
|
||||
- '8'
|
||||
- '9'
|
||||
channel: nautilus/edge
|
||||
gnocchi:
|
||||
series: *series
|
||||
charm: ../../../gnocchi
|
||||
charm: ../../../gnocchi.charm
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '10'
|
||||
memcached:
|
||||
charm: cs:~memcached-team/memcached
|
||||
charm: ch:memcached
|
||||
num_units: 1
|
||||
to:
|
||||
- '11'
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
local_overlay_enabled: False
|
||||
|
||||
variables:
|
||||
openstack-origin: &openstack-origin cloud:bionic-stein
|
||||
|
||||
|
@ -19,36 +21,40 @@ machines:
|
|||
# time, given that machine "0" comes up way before machine "6"
|
||||
applications:
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
charm: ch:percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
channel: 5.7/edge
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '1'
|
||||
channel: 3.6/edge
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
charm: ch:keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '2'
|
||||
channel: train/edge
|
||||
ceilometer:
|
||||
charm: cs:~openstack-charmers/ceilometer
|
||||
charm: ch:ceilometer
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
channel: train/edge
|
||||
gnocchi:
|
||||
series: *series
|
||||
charm: ../../../gnocchi
|
||||
charm: ../../../gnocchi.charm
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
@ -56,7 +62,7 @@ applications:
|
|||
to:
|
||||
- '4'
|
||||
memcached:
|
||||
charm: cs:~memcached-team/memcached
|
||||
charm: ch:memcached
|
||||
num_units: 1
|
||||
to:
|
||||
- '5'
|
||||
|
@ -73,7 +79,7 @@ applications:
|
|||
to:
|
||||
- '6'
|
||||
swift-storage:
|
||||
charm: cs:~openstack-charmers/swift-storage
|
||||
charm: ch:swift-storage
|
||||
num_units: 1
|
||||
storage:
|
||||
block-devices: 'cinder,10G'
|
||||
|
@ -82,12 +88,14 @@ applications:
|
|||
zone: 1
|
||||
to:
|
||||
- '7'
|
||||
channel: train/edge
|
||||
vault:
|
||||
charm: cs:~openstack-charmers/vault
|
||||
charm: ch:vault
|
||||
num_units: 1
|
||||
series: *series
|
||||
to:
|
||||
- '8'
|
||||
channel: 1.6/edge
|
||||
relations:
|
||||
- - keystone:shared-db
|
||||
- percona-cluster:shared-db
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
local_overlay_enabled: False
|
||||
|
||||
variables:
|
||||
openstack-origin: &openstack-origin cloud:bionic-stein
|
||||
|
||||
|
@ -22,35 +24,39 @@ machines:
|
|||
# time, given that machine "0" comes up way before machine "6"
|
||||
applications:
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
charm: ch:percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
channel: 5.7/edge
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '1'
|
||||
channel: 3.6/edge
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
charm: ch:keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '2'
|
||||
channel: train/edge
|
||||
ceilometer:
|
||||
charm: cs:~openstack-charmers/ceilometer
|
||||
charm: ch:ceilometer
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
channel: train/edge
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers/ceph-osd
|
||||
charm: ch:ceph-osd
|
||||
num_units: 3
|
||||
storage:
|
||||
osd-devices: 'cinder,10G'
|
||||
|
@ -60,8 +66,9 @@ applications:
|
|||
- '4'
|
||||
- '5'
|
||||
- '6'
|
||||
channel: nautilus/edge
|
||||
ceph-mon:
|
||||
charm: cs:~openstack-charmers/ceph-mon
|
||||
charm: ch:ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
expected-osd-count: 3
|
||||
|
@ -71,16 +78,17 @@ applications:
|
|||
- '7'
|
||||
- '8'
|
||||
- '9'
|
||||
channel: nautilus/edge
|
||||
gnocchi:
|
||||
series: *series
|
||||
charm: ../../../gnocchi
|
||||
charm: ../../../gnocchi.charm
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '10'
|
||||
memcached:
|
||||
charm: cs:~memcached-team/memcached
|
||||
charm: ch:memcached
|
||||
num_units: 1
|
||||
to:
|
||||
- '11'
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
local_overlay_enabled: False
|
||||
|
||||
variables:
|
||||
openstack-origin: &openstack-origin cloud:bionic-train
|
||||
|
||||
|
@ -19,36 +21,40 @@ machines:
|
|||
# time, given that machine "0" comes up way before machine "6"
|
||||
applications:
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
charm: ch:percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
channel: 5.7/edge
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '1'
|
||||
channel: 3.6/edge
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
charm: ch:keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '2'
|
||||
channel: train/edge
|
||||
ceilometer:
|
||||
charm: cs:~openstack-charmers/ceilometer
|
||||
charm: ch:ceilometer
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
channel: train/edge
|
||||
gnocchi:
|
||||
series: *series
|
||||
charm: ../../../gnocchi
|
||||
charm: ../../../gnocchi.charm
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
@ -56,7 +62,7 @@ applications:
|
|||
to:
|
||||
- '4'
|
||||
memcached:
|
||||
charm: cs:~memcached-team/memcached
|
||||
charm: ch:memcached
|
||||
num_units: 1
|
||||
to:
|
||||
- '5'
|
||||
|
@ -73,7 +79,7 @@ applications:
|
|||
to:
|
||||
- '6'
|
||||
swift-storage:
|
||||
charm: cs:~openstack-charmers/swift-storage
|
||||
charm: ch:swift-storage
|
||||
num_units: 1
|
||||
storage:
|
||||
block-devices: 'cinder,10G'
|
||||
|
@ -82,12 +88,14 @@ applications:
|
|||
zone: 1
|
||||
to:
|
||||
- '7'
|
||||
channel: train/edge
|
||||
vault:
|
||||
charm: cs:~openstack-charmers/vault
|
||||
charm: ch:vault
|
||||
num_units: 1
|
||||
series: *series
|
||||
to:
|
||||
- '8'
|
||||
channel: 1.6/edge
|
||||
relations:
|
||||
- - keystone:shared-db
|
||||
- percona-cluster:shared-db
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
local_overlay_enabled: False
|
||||
|
||||
variables:
|
||||
openstack-origin: &openstack-origin cloud:bionic-train
|
||||
|
||||
|
@ -22,35 +24,39 @@ machines:
|
|||
# time, given that machine "0" comes up way before machine "6"
|
||||
applications:
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
charm: ch:percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
channel: 5.7/edge
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '1'
|
||||
channel: 3.6/edge
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
charm: ch:keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '2'
|
||||
channel: train/edge
|
||||
ceilometer:
|
||||
charm: cs:~openstack-charmers/ceilometer
|
||||
charm: ch:ceilometer
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
channel: train/edge
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers/ceph-osd
|
||||
charm: ch:ceph-osd
|
||||
num_units: 3
|
||||
storage:
|
||||
osd-devices: 'cinder,10G'
|
||||
|
@ -60,8 +66,9 @@ applications:
|
|||
- '4'
|
||||
- '5'
|
||||
- '6'
|
||||
channel: nautilus/edge
|
||||
ceph-mon:
|
||||
charm: cs:~openstack-charmers/ceph-mon
|
||||
charm: ch:ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
expected-osd-count: 3
|
||||
|
@ -71,16 +78,17 @@ applications:
|
|||
- '7'
|
||||
- '8'
|
||||
- '9'
|
||||
channel: nautilus/edge
|
||||
gnocchi:
|
||||
series: *series
|
||||
charm: ../../../gnocchi
|
||||
charm: ../../../gnocchi.charm
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '10'
|
||||
memcached:
|
||||
charm: cs:~memcached-team/memcached
|
||||
charm: ch:memcached
|
||||
num_units: 1
|
||||
to:
|
||||
- '11'
|
||||
|
|
|
@ -1,123 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin cloud:bionic-ussuri
|
||||
|
||||
series: &series bionic
|
||||
|
||||
machines:
|
||||
0:
|
||||
constraints: "mem=3072M"
|
||||
1: {}
|
||||
2: {}
|
||||
3: {}
|
||||
4: {}
|
||||
5: {}
|
||||
6: {}
|
||||
7: {}
|
||||
8: {}
|
||||
|
||||
# We specify machine placements for these to improve iteration
|
||||
# time, given that machine "0" comes up way before machine "6"
|
||||
applications:
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '1'
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '2'
|
||||
ceilometer:
|
||||
charm: cs:~openstack-charmers/ceilometer
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
gnocchi:
|
||||
series: *series
|
||||
charm: ../../../gnocchi
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
storage-backend: s3
|
||||
to:
|
||||
- '4'
|
||||
memcached:
|
||||
charm: cs:~memcached-team/memcached
|
||||
num_units: 1
|
||||
to:
|
||||
- '5'
|
||||
#swift-proxy is used to test gnocchi against an S3 storage backend
|
||||
swift-proxy:
|
||||
charm: swift-proxy
|
||||
series: bionic
|
||||
num_units: 1
|
||||
options:
|
||||
zone-assignment: manual
|
||||
replicas: 1
|
||||
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '6'
|
||||
swift-storage:
|
||||
charm: cs:~openstack-charmers/swift-storage
|
||||
num_units: 1
|
||||
storage:
|
||||
block-devices: 'cinder,10G'
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
zone: 1
|
||||
to:
|
||||
- '7'
|
||||
vault:
|
||||
charm: cs:~openstack-charmers/vault
|
||||
num_units: 1
|
||||
series: *series
|
||||
to:
|
||||
- '8'
|
||||
relations:
|
||||
- - keystone:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - ceilometer:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - ceilometer:identity-credentials
|
||||
- keystone:identity-credentials
|
||||
- - ceilometer:identity-notifications
|
||||
- keystone:identity-notifications
|
||||
- - ceilometer:metric-service
|
||||
- gnocchi:metric-service
|
||||
- - gnocchi:identity-service
|
||||
- keystone:identity-service
|
||||
- - gnocchi:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - gnocchi:coordinator-memcached
|
||||
- memcached:cache
|
||||
- - swift-proxy:identity-service
|
||||
- keystone:identity-service
|
||||
- - swift-storage:swift-storage
|
||||
- swift-proxy:swift-storage
|
||||
- - vault:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - vault:certificates
|
||||
- swift-proxy:certificates
|
||||
- - vault:certificates
|
||||
- gnocchi:certificates
|
||||
- - vault:certificates
|
||||
- ceilometer:certificates
|
||||
- - vault:certificates
|
||||
- keystone:certificates
|
||||
- - vault:certificates
|
||||
- rabbitmq-server:certificates
|
|
@ -1,107 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin cloud:bionic-ussuri
|
||||
|
||||
series: &series bionic
|
||||
|
||||
machines:
|
||||
0:
|
||||
constraints: "mem=3072M"
|
||||
1: {}
|
||||
2: {}
|
||||
3: {}
|
||||
4: {}
|
||||
5: {}
|
||||
6: {}
|
||||
7: {}
|
||||
8: {}
|
||||
9: {}
|
||||
10: {}
|
||||
11: {}
|
||||
|
||||
# We specify machine placements for these to improve iteration
|
||||
# time, given that machine "0" comes up way before machine "6"
|
||||
applications:
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '1'
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '2'
|
||||
ceilometer:
|
||||
charm: cs:~openstack-charmers/ceilometer
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers/ceph-osd
|
||||
num_units: 3
|
||||
storage:
|
||||
osd-devices: 'cinder,10G'
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
- '5'
|
||||
- '6'
|
||||
ceph-mon:
|
||||
charm: cs:~openstack-charmers/ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
expected-osd-count: 3
|
||||
monitor-count: '3'
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '7'
|
||||
- '8'
|
||||
- '9'
|
||||
gnocchi:
|
||||
series: *series
|
||||
charm: ../../../gnocchi
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '10'
|
||||
memcached:
|
||||
charm: cs:~memcached-team/memcached
|
||||
num_units: 1
|
||||
to:
|
||||
- '11'
|
||||
relations:
|
||||
- - 'keystone:shared-db'
|
||||
- 'percona-cluster:shared-db'
|
||||
- - 'ceph-osd:mon'
|
||||
- 'ceph-mon:osd'
|
||||
- - 'ceilometer:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
- - 'ceilometer:identity-credentials'
|
||||
- 'keystone:identity-credentials'
|
||||
- - 'ceilometer:identity-notifications'
|
||||
- 'keystone:identity-notifications'
|
||||
- - 'ceilometer:metric-service'
|
||||
- 'gnocchi:metric-service'
|
||||
- - 'gnocchi:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
- - 'gnocchi:shared-db'
|
||||
- 'percona-cluster:shared-db'
|
||||
- - 'gnocchi:storage-ceph'
|
||||
- 'ceph-mon:client'
|
||||
- - 'gnocchi:coordinator-memcached'
|
||||
- 'memcached:cache'
|
|
@ -1,145 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
series: &series focal
|
||||
|
||||
machines:
|
||||
0:
|
||||
constraints: "mem=3072M"
|
||||
1:
|
||||
constraints: "mem=3072M"
|
||||
2:
|
||||
constraints: "mem=3072M"
|
||||
3: {}
|
||||
4: {}
|
||||
5: {}
|
||||
6: {}
|
||||
7: {}
|
||||
8: {}
|
||||
9: {}
|
||||
10:
|
||||
series: bionic
|
||||
|
||||
# We specify machine placements for these to improve iteration
|
||||
# time, given that machine "0" comes up way before machine "6"
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
gnocchi-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
vault-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
|
||||
mysql-innodb-cluster:
|
||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
ceilometer:
|
||||
charm: cs:~openstack-charmers/ceilometer
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '5'
|
||||
gnocchi:
|
||||
series: *series
|
||||
charm: ../../../gnocchi
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
storage-backend: s3
|
||||
to:
|
||||
- '6'
|
||||
memcached:
|
||||
charm: cs:~memcached-team/memcached
|
||||
num_units: 1
|
||||
# holding at bionic as memcached doesn't support focal yet
|
||||
series: bionic
|
||||
to:
|
||||
- '10'
|
||||
#swift-proxy is used to test gnocchi against an S3 storage backend
|
||||
swift-proxy:
|
||||
charm: swift-proxy
|
||||
num_units: 1
|
||||
options:
|
||||
zone-assignment: manual
|
||||
replicas: 1
|
||||
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '7'
|
||||
swift-storage:
|
||||
charm: cs:~openstack-charmers/swift-storage
|
||||
num_units: 1
|
||||
storage:
|
||||
block-devices: 'cinder,10G'
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
zone: 1
|
||||
to:
|
||||
- '8'
|
||||
vault:
|
||||
charm: cs:~openstack-charmers/vault
|
||||
num_units: 1
|
||||
series: *series
|
||||
to:
|
||||
- '9'
|
||||
relations:
|
||||
- - keystone:shared-db
|
||||
- keystone-mysql-router:shared-db
|
||||
- - keystone-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - gnocchi:shared-db
|
||||
- gnocchi-mysql-router:shared-db
|
||||
- - gnocchi-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - ceilometer:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - ceilometer:identity-credentials
|
||||
- keystone:identity-credentials
|
||||
- - ceilometer:identity-notifications
|
||||
- keystone:identity-notifications
|
||||
- - ceilometer:metric-service
|
||||
- gnocchi:metric-service
|
||||
- - gnocchi:identity-service
|
||||
- keystone:identity-service
|
||||
- - gnocchi:coordinator-memcached
|
||||
- memcached:cache
|
||||
- - swift-proxy:identity-service
|
||||
- keystone:identity-service
|
||||
- - swift-storage:swift-storage
|
||||
- swift-proxy:swift-storage
|
||||
- - vault:shared-db
|
||||
- vault-mysql-router:shared-db
|
||||
- - vault-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - vault:certificates
|
||||
- swift-proxy:certificates
|
||||
- - vault:certificates
|
||||
- gnocchi:certificates
|
||||
- - vault:certificates
|
||||
- ceilometer:certificates
|
||||
- - vault:certificates
|
||||
- keystone:certificates
|
||||
- - vault:certificates
|
||||
- rabbitmq-server:certificates
|
|
@ -1,144 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
series: &series focal
|
||||
|
||||
machines:
|
||||
'0':
|
||||
constraints: mem=3072M
|
||||
'1':
|
||||
constraints: mem=3072M
|
||||
'2':
|
||||
constraints: mem=3072M
|
||||
'3':
|
||||
'4':
|
||||
'5':
|
||||
'6':
|
||||
'7':
|
||||
'8':
|
||||
'9':
|
||||
'10':
|
||||
'11':
|
||||
'12':
|
||||
'13':
|
||||
series: bionic
|
||||
|
||||
# We specify machine placements for these to improve iteration
|
||||
# time, given that machine "0" comes up way before machine "6"
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
gnocchi-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
|
||||
mysql-innodb-cluster:
|
||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
|
||||
ceilometer:
|
||||
charm: cs:~openstack-charmers/ceilometer
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '5'
|
||||
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers/ceph-osd
|
||||
num_units: 3
|
||||
storage:
|
||||
osd-devices: 'cinder,10G'
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '6'
|
||||
- '7'
|
||||
- '8'
|
||||
|
||||
ceph-mon:
|
||||
charm: cs:~openstack-charmers/ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
expected-osd-count: 3
|
||||
monitor-count: '3'
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '9'
|
||||
- '10'
|
||||
- '11'
|
||||
|
||||
gnocchi:
|
||||
series: *series
|
||||
charm: ../../../gnocchi
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '12'
|
||||
|
||||
memcached:
|
||||
charm: cs:~memcached-team/memcached
|
||||
num_units: 1
|
||||
# holding at bionic as memcached doesn't support focal yet
|
||||
series: bionic
|
||||
to:
|
||||
- '13'
|
||||
|
||||
relations:
|
||||
|
||||
- - 'keystone:shared-db'
|
||||
- 'keystone-mysql-router:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'ceph-osd:mon'
|
||||
- 'ceph-mon:osd'
|
||||
|
||||
- - 'ceilometer:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'ceilometer:identity-credentials'
|
||||
- 'keystone:identity-credentials'
|
||||
|
||||
- - 'ceilometer:identity-notifications'
|
||||
- 'keystone:identity-notifications'
|
||||
|
||||
- - 'ceilometer:metric-service'
|
||||
- 'gnocchi:metric-service'
|
||||
|
||||
- - 'gnocchi:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'gnocchi:shared-db'
|
||||
- 'gnocchi-mysql-router:shared-db'
|
||||
- - 'gnocchi-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'gnocchi:storage-ceph'
|
||||
- 'ceph-mon:client'
|
||||
|
||||
- - 'gnocchi:coordinator-memcached'
|
||||
- 'memcached:cache'
|
|
@ -1,145 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin cloud:focal-victoria
|
||||
|
||||
series: &series focal
|
||||
|
||||
machines:
|
||||
0:
|
||||
constraints: "mem=3072M"
|
||||
1:
|
||||
constraints: "mem=3072M"
|
||||
2:
|
||||
constraints: "mem=3072M"
|
||||
3: {}
|
||||
4: {}
|
||||
5: {}
|
||||
6: {}
|
||||
7: {}
|
||||
8: {}
|
||||
9: {}
|
||||
10:
|
||||
series: bionic
|
||||
|
||||
# We specify machine placements for these to improve iteration
|
||||
# time, given that machine "0" comes up way before machine "6"
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
gnocchi-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
vault-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
|
||||
mysql-innodb-cluster:
|
||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
ceilometer:
|
||||
charm: cs:~openstack-charmers/ceilometer
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '5'
|
||||
gnocchi:
|
||||
series: *series
|
||||
charm: ../../../gnocchi
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
storage-backend: s3
|
||||
to:
|
||||
- '6'
|
||||
memcached:
|
||||
charm: cs:~memcached-team/memcached
|
||||
num_units: 1
|
||||
# holding at bionic as memcached doesn't support focal yet
|
||||
series: bionic
|
||||
to:
|
||||
- '10'
|
||||
#swift-proxy is used to test gnocchi against an S3 storage backend
|
||||
swift-proxy:
|
||||
charm: swift-proxy
|
||||
num_units: 1
|
||||
options:
|
||||
zone-assignment: manual
|
||||
replicas: 1
|
||||
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '7'
|
||||
swift-storage:
|
||||
charm: cs:~openstack-charmers/swift-storage
|
||||
num_units: 1
|
||||
storage:
|
||||
block-devices: 'cinder,10G'
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
zone: 1
|
||||
to:
|
||||
- '8'
|
||||
vault:
|
||||
charm: cs:~openstack-charmers/vault
|
||||
num_units: 1
|
||||
series: *series
|
||||
to:
|
||||
- '9'
|
||||
relations:
|
||||
- - keystone:shared-db
|
||||
- keystone-mysql-router:shared-db
|
||||
- - keystone-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - gnocchi:shared-db
|
||||
- gnocchi-mysql-router:shared-db
|
||||
- - gnocchi-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - ceilometer:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - ceilometer:identity-credentials
|
||||
- keystone:identity-credentials
|
||||
- - ceilometer:identity-notifications
|
||||
- keystone:identity-notifications
|
||||
- - ceilometer:metric-service
|
||||
- gnocchi:metric-service
|
||||
- - gnocchi:identity-service
|
||||
- keystone:identity-service
|
||||
- - gnocchi:coordinator-memcached
|
||||
- memcached:cache
|
||||
- - swift-proxy:identity-service
|
||||
- keystone:identity-service
|
||||
- - swift-storage:swift-storage
|
||||
- swift-proxy:swift-storage
|
||||
- - vault:shared-db
|
||||
- vault-mysql-router:shared-db
|
||||
- - vault-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - vault:certificates
|
||||
- swift-proxy:certificates
|
||||
- - vault:certificates
|
||||
- gnocchi:certificates
|
||||
- - vault:certificates
|
||||
- ceilometer:certificates
|
||||
- - vault:certificates
|
||||
- keystone:certificates
|
||||
- - vault:certificates
|
||||
- rabbitmq-server:certificates
|
|
@ -1,144 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin cloud:focal-victoria
|
||||
|
||||
series: &series focal
|
||||
|
||||
machines:
|
||||
'0':
|
||||
constraints: mem=3072M
|
||||
'1':
|
||||
constraints: mem=3072M
|
||||
'2':
|
||||
constraints: mem=3072M
|
||||
'3':
|
||||
'4':
|
||||
'5':
|
||||
'6':
|
||||
'7':
|
||||
'8':
|
||||
'9':
|
||||
'10':
|
||||
'11':
|
||||
'12':
|
||||
'13':
|
||||
series: bionic
|
||||
|
||||
# We specify machine placements for these to improve iteration
|
||||
# time, given that machine "0" comes up way before machine "6"
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
gnocchi-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
|
||||
mysql-innodb-cluster:
|
||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
|
||||
ceilometer:
|
||||
charm: cs:~openstack-charmers/ceilometer
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '5'
|
||||
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers/ceph-osd
|
||||
num_units: 3
|
||||
storage:
|
||||
osd-devices: 'cinder,10G'
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '6'
|
||||
- '7'
|
||||
- '8'
|
||||
|
||||
ceph-mon:
|
||||
charm: cs:~openstack-charmers/ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
expected-osd-count: 3
|
||||
monitor-count: '3'
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '9'
|
||||
- '10'
|
||||
- '11'
|
||||
|
||||
gnocchi:
|
||||
series: *series
|
||||
charm: ../../../gnocchi
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '12'
|
||||
|
||||
memcached:
|
||||
charm: cs:~memcached-team/memcached
|
||||
num_units: 1
|
||||
# holding at bionic as memcached doesn't support focal yet
|
||||
series: bionic
|
||||
to:
|
||||
- '13'
|
||||
|
||||
relations:
|
||||
|
||||
- - 'keystone:shared-db'
|
||||
- 'keystone-mysql-router:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'ceph-osd:mon'
|
||||
- 'ceph-mon:osd'
|
||||
|
||||
- - 'ceilometer:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'ceilometer:identity-credentials'
|
||||
- 'keystone:identity-credentials'
|
||||
|
||||
- - 'ceilometer:identity-notifications'
|
||||
- 'keystone:identity-notifications'
|
||||
|
||||
- - 'ceilometer:metric-service'
|
||||
- 'gnocchi:metric-service'
|
||||
|
||||
- - 'gnocchi:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'gnocchi:shared-db'
|
||||
- 'gnocchi-mysql-router:shared-db'
|
||||
- - 'gnocchi-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'gnocchi:storage-ceph'
|
||||
- 'ceph-mon:client'
|
||||
|
||||
- - 'gnocchi:coordinator-memcached'
|
||||
- 'memcached:cache'
|
|
@ -1,145 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin cloud:focal-wallaby
|
||||
|
||||
series: &series focal
|
||||
|
||||
machines:
|
||||
0:
|
||||
constraints: "mem=3072M"
|
||||
1:
|
||||
constraints: "mem=3072M"
|
||||
2:
|
||||
constraints: "mem=3072M"
|
||||
3: {}
|
||||
4: {}
|
||||
5: {}
|
||||
6: {}
|
||||
7: {}
|
||||
8: {}
|
||||
9: {}
|
||||
10:
|
||||
series: bionic
|
||||
|
||||
# We specify machine placements for these to improve iteration
|
||||
# time, given that machine "0" comes up way before machine "6"
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
gnocchi-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
vault-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
|
||||
mysql-innodb-cluster:
|
||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
ceilometer:
|
||||
charm: cs:~openstack-charmers/ceilometer
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '5'
|
||||
gnocchi:
|
||||
series: *series
|
||||
charm: ../../../gnocchi
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
storage-backend: s3
|
||||
to:
|
||||
- '6'
|
||||
memcached:
|
||||
charm: cs:~memcached-team/memcached
|
||||
num_units: 1
|
||||
# holding at bionic as memcached doesn't support focal yet
|
||||
series: bionic
|
||||
to:
|
||||
- '10'
|
||||
#swift-proxy is used to test gnocchi against an S3 storage backend
|
||||
swift-proxy:
|
||||
charm: swift-proxy
|
||||
num_units: 1
|
||||
options:
|
||||
zone-assignment: manual
|
||||
replicas: 1
|
||||
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '7'
|
||||
swift-storage:
|
||||
charm: cs:~openstack-charmers/swift-storage
|
||||
num_units: 1
|
||||
storage:
|
||||
block-devices: 'cinder,10G'
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
zone: 1
|
||||
to:
|
||||
- '8'
|
||||
vault:
|
||||
charm: cs:~openstack-charmers/vault
|
||||
num_units: 1
|
||||
series: *series
|
||||
to:
|
||||
- '9'
|
||||
relations:
|
||||
- - keystone:shared-db
|
||||
- keystone-mysql-router:shared-db
|
||||
- - keystone-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - gnocchi:shared-db
|
||||
- gnocchi-mysql-router:shared-db
|
||||
- - gnocchi-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - ceilometer:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - ceilometer:identity-credentials
|
||||
- keystone:identity-credentials
|
||||
- - ceilometer:identity-notifications
|
||||
- keystone:identity-notifications
|
||||
- - ceilometer:metric-service
|
||||
- gnocchi:metric-service
|
||||
- - gnocchi:identity-service
|
||||
- keystone:identity-service
|
||||
- - gnocchi:coordinator-memcached
|
||||
- memcached:cache
|
||||
- - swift-proxy:identity-service
|
||||
- keystone:identity-service
|
||||
- - swift-storage:swift-storage
|
||||
- swift-proxy:swift-storage
|
||||
- - vault:shared-db
|
||||
- vault-mysql-router:shared-db
|
||||
- - vault-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - vault:certificates
|
||||
- swift-proxy:certificates
|
||||
- - vault:certificates
|
||||
- gnocchi:certificates
|
||||
- - vault:certificates
|
||||
- ceilometer:certificates
|
||||
- - vault:certificates
|
||||
- keystone:certificates
|
||||
- - vault:certificates
|
||||
- rabbitmq-server:certificates
|
|
@ -1,144 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin cloud:focal-wallaby
|
||||
|
||||
series: &series focal
|
||||
|
||||
machines:
|
||||
'0':
|
||||
constraints: mem=3072M
|
||||
'1':
|
||||
constraints: mem=3072M
|
||||
'2':
|
||||
constraints: mem=3072M
|
||||
'3':
|
||||
'4':
|
||||
'5':
|
||||
'6':
|
||||
'7':
|
||||
'8':
|
||||
'9':
|
||||
'10':
|
||||
'11':
|
||||
'12':
|
||||
'13':
|
||||
series: bionic
|
||||
|
||||
# We specify machine placements for these to improve iteration
|
||||
# time, given that machine "0" comes up way before machine "6"
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
gnocchi-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
|
||||
mysql-innodb-cluster:
|
||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
|
||||
ceilometer:
|
||||
charm: cs:~openstack-charmers/ceilometer
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '5'
|
||||
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers/ceph-osd
|
||||
num_units: 3
|
||||
storage:
|
||||
osd-devices: 'cinder,10G'
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '6'
|
||||
- '7'
|
||||
- '8'
|
||||
|
||||
ceph-mon:
|
||||
charm: cs:~openstack-charmers/ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
expected-osd-count: 3
|
||||
monitor-count: '3'
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '9'
|
||||
- '10'
|
||||
- '11'
|
||||
|
||||
gnocchi:
|
||||
series: *series
|
||||
charm: ../../../gnocchi
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '12'
|
||||
|
||||
memcached:
|
||||
charm: cs:~memcached-team/memcached
|
||||
num_units: 1
|
||||
# holding at bionic as memcached doesn't support focal yet
|
||||
series: bionic
|
||||
to:
|
||||
- '13'
|
||||
|
||||
relations:
|
||||
|
||||
- - 'keystone:shared-db'
|
||||
- 'keystone-mysql-router:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'ceph-osd:mon'
|
||||
- 'ceph-mon:osd'
|
||||
|
||||
- - 'ceilometer:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'ceilometer:identity-credentials'
|
||||
- 'keystone:identity-credentials'
|
||||
|
||||
- - 'ceilometer:identity-notifications'
|
||||
- 'keystone:identity-notifications'
|
||||
|
||||
- - 'ceilometer:metric-service'
|
||||
- 'gnocchi:metric-service'
|
||||
|
||||
- - 'gnocchi:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'gnocchi:shared-db'
|
||||
- 'gnocchi-mysql-router:shared-db'
|
||||
- - 'gnocchi-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'gnocchi:storage-ceph'
|
||||
- 'ceph-mon:client'
|
||||
|
||||
- - 'gnocchi:coordinator-memcached'
|
||||
- 'memcached:cache'
|
|
@ -1,145 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin cloud:focal-xena
|
||||
|
||||
series: &series focal
|
||||
|
||||
machines:
|
||||
0:
|
||||
constraints: "mem=3072M"
|
||||
1:
|
||||
constraints: "mem=3072M"
|
||||
2:
|
||||
constraints: "mem=3072M"
|
||||
3: {}
|
||||
4: {}
|
||||
5: {}
|
||||
6: {}
|
||||
7: {}
|
||||
8: {}
|
||||
9: {}
|
||||
10:
|
||||
series: bionic
|
||||
|
||||
# We specify machine placements for these to improve iteration
|
||||
# time, given that machine "0" comes up way before machine "6"
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
gnocchi-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
vault-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
|
||||
mysql-innodb-cluster:
|
||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
ceilometer:
|
||||
charm: cs:~openstack-charmers/ceilometer
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '5'
|
||||
gnocchi:
|
||||
series: *series
|
||||
charm: ../../../gnocchi
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
storage-backend: s3
|
||||
to:
|
||||
- '6'
|
||||
memcached:
|
||||
charm: cs:~memcached-team/memcached
|
||||
num_units: 1
|
||||
# holding at bionic as memcached doesn't support focal yet
|
||||
series: bionic
|
||||
to:
|
||||
- '10'
|
||||
#swift-proxy is used to test gnocchi against an S3 storage backend
|
||||
swift-proxy:
|
||||
charm: swift-proxy
|
||||
num_units: 1
|
||||
options:
|
||||
zone-assignment: manual
|
||||
replicas: 1
|
||||
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '7'
|
||||
swift-storage:
|
||||
charm: cs:~openstack-charmers/swift-storage
|
||||
num_units: 1
|
||||
storage:
|
||||
block-devices: 'cinder,10G'
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
zone: 1
|
||||
to:
|
||||
- '8'
|
||||
vault:
|
||||
charm: cs:~openstack-charmers/vault
|
||||
num_units: 1
|
||||
series: *series
|
||||
to:
|
||||
- '9'
|
||||
relations:
|
||||
- - keystone:shared-db
|
||||
- keystone-mysql-router:shared-db
|
||||
- - keystone-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - gnocchi:shared-db
|
||||
- gnocchi-mysql-router:shared-db
|
||||
- - gnocchi-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - ceilometer:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - ceilometer:identity-credentials
|
||||
- keystone:identity-credentials
|
||||
- - ceilometer:identity-notifications
|
||||
- keystone:identity-notifications
|
||||
- - ceilometer:metric-service
|
||||
- gnocchi:metric-service
|
||||
- - gnocchi:identity-service
|
||||
- keystone:identity-service
|
||||
- - gnocchi:coordinator-memcached
|
||||
- memcached:cache
|
||||
- - swift-proxy:identity-service
|
||||
- keystone:identity-service
|
||||
- - swift-storage:swift-storage
|
||||
- swift-proxy:swift-storage
|
||||
- - vault:shared-db
|
||||
- vault-mysql-router:shared-db
|
||||
- - vault-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - vault:certificates
|
||||
- swift-proxy:certificates
|
||||
- - vault:certificates
|
||||
- gnocchi:certificates
|
||||
- - vault:certificates
|
||||
- ceilometer:certificates
|
||||
- - vault:certificates
|
||||
- keystone:certificates
|
||||
- - vault:certificates
|
||||
- rabbitmq-server:certificates
|
|
@ -1,144 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin cloud:focal-xena
|
||||
|
||||
series: &series focal
|
||||
|
||||
machines:
|
||||
'0':
|
||||
constraints: mem=3072M
|
||||
'1':
|
||||
constraints: mem=3072M
|
||||
'2':
|
||||
constraints: mem=3072M
|
||||
'3':
|
||||
'4':
|
||||
'5':
|
||||
'6':
|
||||
'7':
|
||||
'8':
|
||||
'9':
|
||||
'10':
|
||||
'11':
|
||||
'12':
|
||||
'13':
|
||||
series: bionic
|
||||
|
||||
# We specify machine placements for these to improve iteration
|
||||
# time, given that machine "0" comes up way before machine "6"
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
gnocchi-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
|
||||
mysql-innodb-cluster:
|
||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
|
||||
ceilometer:
|
||||
charm: cs:~openstack-charmers/ceilometer
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '5'
|
||||
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers/ceph-osd
|
||||
num_units: 3
|
||||
storage:
|
||||
osd-devices: 'cinder,10G'
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '6'
|
||||
- '7'
|
||||
- '8'
|
||||
|
||||
ceph-mon:
|
||||
charm: cs:~openstack-charmers/ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
expected-osd-count: 3
|
||||
monitor-count: '3'
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '9'
|
||||
- '10'
|
||||
- '11'
|
||||
|
||||
gnocchi:
|
||||
series: *series
|
||||
charm: ../../../gnocchi
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '12'
|
||||
|
||||
memcached:
|
||||
charm: cs:~memcached-team/memcached
|
||||
num_units: 1
|
||||
# holding at bionic as memcached doesn't support focal yet
|
||||
series: bionic
|
||||
to:
|
||||
- '13'
|
||||
|
||||
relations:
|
||||
|
||||
- - 'keystone:shared-db'
|
||||
- 'keystone-mysql-router:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'ceph-osd:mon'
|
||||
- 'ceph-mon:osd'
|
||||
|
||||
- - 'ceilometer:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'ceilometer:identity-credentials'
|
||||
- 'keystone:identity-credentials'
|
||||
|
||||
- - 'ceilometer:identity-notifications'
|
||||
- 'keystone:identity-notifications'
|
||||
|
||||
- - 'ceilometer:metric-service'
|
||||
- 'gnocchi:metric-service'
|
||||
|
||||
- - 'gnocchi:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'gnocchi:shared-db'
|
||||
- 'gnocchi-mysql-router:shared-db'
|
||||
- - 'gnocchi-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'gnocchi:storage-ceph'
|
||||
- 'ceph-mon:client'
|
||||
|
||||
- - 'gnocchi:coordinator-memcached'
|
||||
- 'memcached:cache'
|
|
@ -1,145 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
series: &series groovy
|
||||
|
||||
machines:
|
||||
0:
|
||||
constraints: "mem=3072M"
|
||||
1:
|
||||
constraints: "mem=3072M"
|
||||
2:
|
||||
constraints: "mem=3072M"
|
||||
3: {}
|
||||
4: {}
|
||||
5: {}
|
||||
6: {}
|
||||
7: {}
|
||||
8: {}
|
||||
9: {}
|
||||
10:
|
||||
series: bionic
|
||||
|
||||
# We specify machine placements for these to improve iteration
|
||||
# time, given that machine "0" comes up way before machine "6"
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
gnocchi-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
vault-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
|
||||
mysql-innodb-cluster:
|
||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
ceilometer:
|
||||
charm: cs:~openstack-charmers/ceilometer
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '5'
|
||||
gnocchi:
|
||||
series: *series
|
||||
charm: ../../../gnocchi
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
storage-backend: s3
|
||||
to:
|
||||
- '6'
|
||||
memcached:
|
||||
charm: cs:~memcached-team/memcached
|
||||
num_units: 1
|
||||
# holding at bionic as memcached doesn't support focal/groovy yet
|
||||
series: bionic
|
||||
to:
|
||||
- '10'
|
||||
#swift-proxy is used to test gnocchi against an S3 storage backend
|
||||
swift-proxy:
|
||||
charm: swift-proxy
|
||||
num_units: 1
|
||||
options:
|
||||
zone-assignment: manual
|
||||
replicas: 1
|
||||
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '7'
|
||||
swift-storage:
|
||||
charm: cs:~openstack-charmers/swift-storage
|
||||
num_units: 1
|
||||
storage:
|
||||
block-devices: 'cinder,10G'
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
zone: 1
|
||||
to:
|
||||
- '8'
|
||||
vault:
|
||||
charm: cs:~openstack-charmers/vault
|
||||
num_units: 1
|
||||
series: *series
|
||||
to:
|
||||
- '9'
|
||||
relations:
|
||||
- - keystone:shared-db
|
||||
- keystone-mysql-router:shared-db
|
||||
- - keystone-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - gnocchi:shared-db
|
||||
- gnocchi-mysql-router:shared-db
|
||||
- - gnocchi-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - ceilometer:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - ceilometer:identity-credentials
|
||||
- keystone:identity-credentials
|
||||
- - ceilometer:identity-notifications
|
||||
- keystone:identity-notifications
|
||||
- - ceilometer:metric-service
|
||||
- gnocchi:metric-service
|
||||
- - gnocchi:identity-service
|
||||
- keystone:identity-service
|
||||
- - gnocchi:coordinator-memcached
|
||||
- memcached:cache
|
||||
- - swift-proxy:identity-service
|
||||
- keystone:identity-service
|
||||
- - swift-storage:swift-storage
|
||||
- swift-proxy:swift-storage
|
||||
- - vault:shared-db
|
||||
- vault-mysql-router:shared-db
|
||||
- - vault-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - vault:certificates
|
||||
- swift-proxy:certificates
|
||||
- - vault:certificates
|
||||
- gnocchi:certificates
|
||||
- - vault:certificates
|
||||
- ceilometer:certificates
|
||||
- - vault:certificates
|
||||
- keystone:certificates
|
||||
- - vault:certificates
|
||||
- rabbitmq-server:certificates
|
|
@ -1,144 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
series: &series groovy
|
||||
|
||||
machines:
|
||||
'0':
|
||||
constraints: mem=3072M
|
||||
'1':
|
||||
constraints: mem=3072M
|
||||
'2':
|
||||
constraints: mem=3072M
|
||||
'3':
|
||||
'4':
|
||||
'5':
|
||||
'6':
|
||||
'7':
|
||||
'8':
|
||||
'9':
|
||||
'10':
|
||||
'11':
|
||||
'12':
|
||||
'13':
|
||||
series: bionic
|
||||
|
||||
# We specify machine placements for these to improve iteration
|
||||
# time, given that machine "0" comes up way before machine "6"
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
gnocchi-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
|
||||
mysql-innodb-cluster:
|
||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
|
||||
ceilometer:
|
||||
charm: cs:~openstack-charmers/ceilometer
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '5'
|
||||
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers/ceph-osd
|
||||
num_units: 3
|
||||
storage:
|
||||
osd-devices: 'cinder,10G'
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '6'
|
||||
- '7'
|
||||
- '8'
|
||||
|
||||
ceph-mon:
|
||||
charm: cs:~openstack-charmers/ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
expected-osd-count: 3
|
||||
monitor-count: '3'
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '9'
|
||||
- '10'
|
||||
- '11'
|
||||
|
||||
gnocchi:
|
||||
series: *series
|
||||
charm: ../../../gnocchi
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '12'
|
||||
|
||||
memcached:
|
||||
charm: cs:~memcached-team/memcached
|
||||
num_units: 1
|
||||
# holding at bionic as memcached doesn't support focal/groovy yet
|
||||
series: bionic
|
||||
to:
|
||||
- '13'
|
||||
|
||||
relations:
|
||||
|
||||
- - 'keystone:shared-db'
|
||||
- 'keystone-mysql-router:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'ceph-osd:mon'
|
||||
- 'ceph-mon:osd'
|
||||
|
||||
- - 'ceilometer:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'ceilometer:identity-credentials'
|
||||
- 'keystone:identity-credentials'
|
||||
|
||||
- - 'ceilometer:identity-notifications'
|
||||
- 'keystone:identity-notifications'
|
||||
|
||||
- - 'ceilometer:metric-service'
|
||||
- 'gnocchi:metric-service'
|
||||
|
||||
- - 'gnocchi:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'gnocchi:shared-db'
|
||||
- 'gnocchi-mysql-router:shared-db'
|
||||
- - 'gnocchi-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'gnocchi:storage-ceph'
|
||||
- 'ceph-mon:client'
|
||||
|
||||
- - 'gnocchi:coordinator-memcached'
|
||||
- 'memcached:cache'
|
|
@ -1,145 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
series: &series hirsute
|
||||
|
||||
machines:
|
||||
0:
|
||||
constraints: "mem=3072M"
|
||||
1:
|
||||
constraints: "mem=3072M"
|
||||
2:
|
||||
constraints: "mem=3072M"
|
||||
3: {}
|
||||
4: {}
|
||||
5: {}
|
||||
6: {}
|
||||
7: {}
|
||||
8: {}
|
||||
9: {}
|
||||
10:
|
||||
series: bionic
|
||||
|
||||
# We specify machine placements for these to improve iteration
|
||||
# time, given that machine "0" comes up way before machine "6"
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
gnocchi-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
vault-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
|
||||
mysql-innodb-cluster:
|
||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
ceilometer:
|
||||
charm: cs:~openstack-charmers/ceilometer
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '5'
|
||||
gnocchi:
|
||||
series: *series
|
||||
charm: ../../../gnocchi
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
storage-backend: s3
|
||||
to:
|
||||
- '6'
|
||||
memcached:
|
||||
charm: cs:~memcached-team/memcached
|
||||
num_units: 1
|
||||
# holding at bionic as memcached doesn't support focal/groovy yet
|
||||
series: bionic
|
||||
to:
|
||||
- '10'
|
||||
#swift-proxy is used to test gnocchi against an S3 storage backend
|
||||
swift-proxy:
|
||||
charm: swift-proxy
|
||||
num_units: 1
|
||||
options:
|
||||
zone-assignment: manual
|
||||
replicas: 1
|
||||
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '7'
|
||||
swift-storage:
|
||||
charm: cs:~openstack-charmers/swift-storage
|
||||
num_units: 1
|
||||
storage:
|
||||
block-devices: 'cinder,10G'
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
zone: 1
|
||||
to:
|
||||
- '8'
|
||||
vault:
|
||||
charm: cs:~openstack-charmers/vault
|
||||
num_units: 1
|
||||
series: *series
|
||||
to:
|
||||
- '9'
|
||||
relations:
|
||||
- - keystone:shared-db
|
||||
- keystone-mysql-router:shared-db
|
||||
- - keystone-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - gnocchi:shared-db
|
||||
- gnocchi-mysql-router:shared-db
|
||||
- - gnocchi-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - ceilometer:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - ceilometer:identity-credentials
|
||||
- keystone:identity-credentials
|
||||
- - ceilometer:identity-notifications
|
||||
- keystone:identity-notifications
|
||||
- - ceilometer:metric-service
|
||||
- gnocchi:metric-service
|
||||
- - gnocchi:identity-service
|
||||
- keystone:identity-service
|
||||
- - gnocchi:coordinator-memcached
|
||||
- memcached:cache
|
||||
- - swift-proxy:identity-service
|
||||
- keystone:identity-service
|
||||
- - swift-storage:swift-storage
|
||||
- swift-proxy:swift-storage
|
||||
- - vault:shared-db
|
||||
- vault-mysql-router:shared-db
|
||||
- - vault-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - vault:certificates
|
||||
- swift-proxy:certificates
|
||||
- - vault:certificates
|
||||
- gnocchi:certificates
|
||||
- - vault:certificates
|
||||
- ceilometer:certificates
|
||||
- - vault:certificates
|
||||
- keystone:certificates
|
||||
- - vault:certificates
|
||||
- rabbitmq-server:certificates
|
|
@ -1,144 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
series: &series hirsute
|
||||
|
||||
machines:
|
||||
'0':
|
||||
constraints: mem=3072M
|
||||
'1':
|
||||
constraints: mem=3072M
|
||||
'2':
|
||||
constraints: mem=3072M
|
||||
'3':
|
||||
'4':
|
||||
'5':
|
||||
'6':
|
||||
'7':
|
||||
'8':
|
||||
'9':
|
||||
'10':
|
||||
'11':
|
||||
'12':
|
||||
'13':
|
||||
series: bionic
|
||||
|
||||
# We specify machine placements for these to improve iteration
|
||||
# time, given that machine "0" comes up way before machine "6"
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
gnocchi-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
|
||||
mysql-innodb-cluster:
|
||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
|
||||
ceilometer:
|
||||
charm: cs:~openstack-charmers/ceilometer
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '5'
|
||||
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers/ceph-osd
|
||||
num_units: 3
|
||||
storage:
|
||||
osd-devices: 'cinder,10G'
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '6'
|
||||
- '7'
|
||||
- '8'
|
||||
|
||||
ceph-mon:
|
||||
charm: cs:~openstack-charmers/ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
expected-osd-count: 3
|
||||
monitor-count: '3'
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '9'
|
||||
- '10'
|
||||
- '11'
|
||||
|
||||
gnocchi:
|
||||
series: *series
|
||||
charm: ../../../gnocchi
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '12'
|
||||
|
||||
memcached:
|
||||
charm: cs:~memcached-team/memcached
|
||||
num_units: 1
|
||||
# holding at bionic as memcached doesn't support focal/groovy yet
|
||||
series: bionic
|
||||
to:
|
||||
- '13'
|
||||
|
||||
relations:
|
||||
|
||||
- - 'keystone:shared-db'
|
||||
- 'keystone-mysql-router:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'ceph-osd:mon'
|
||||
- 'ceph-mon:osd'
|
||||
|
||||
- - 'ceilometer:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'ceilometer:identity-credentials'
|
||||
- 'keystone:identity-credentials'
|
||||
|
||||
- - 'ceilometer:identity-notifications'
|
||||
- 'keystone:identity-notifications'
|
||||
|
||||
- - 'ceilometer:metric-service'
|
||||
- 'gnocchi:metric-service'
|
||||
|
||||
- - 'gnocchi:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'gnocchi:shared-db'
|
||||
- 'gnocchi-mysql-router:shared-db'
|
||||
- - 'gnocchi-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'gnocchi:storage-ceph'
|
||||
- 'ceph-mon:client'
|
||||
|
||||
- - 'gnocchi:coordinator-memcached'
|
||||
- 'memcached:cache'
|
|
@ -1,145 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
series: &series impish
|
||||
|
||||
machines:
|
||||
0:
|
||||
constraints: "mem=3072M"
|
||||
1:
|
||||
constraints: "mem=3072M"
|
||||
2:
|
||||
constraints: "mem=3072M"
|
||||
3: {}
|
||||
4: {}
|
||||
5: {}
|
||||
6: {}
|
||||
7: {}
|
||||
8: {}
|
||||
9: {}
|
||||
10:
|
||||
series: bionic
|
||||
|
||||
# We specify machine placements for these to improve iteration
|
||||
# time, given that machine "0" comes up way before machine "6"
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
gnocchi-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
vault-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
|
||||
mysql-innodb-cluster:
|
||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
ceilometer:
|
||||
charm: cs:~openstack-charmers/ceilometer
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '5'
|
||||
gnocchi:
|
||||
series: *series
|
||||
charm: ../../../gnocchi
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
storage-backend: s3
|
||||
to:
|
||||
- '6'
|
||||
memcached:
|
||||
charm: cs:~memcached-team/memcached
|
||||
num_units: 1
|
||||
# holding at bionic as memcached doesn't support focal/groovy yet
|
||||
series: bionic
|
||||
to:
|
||||
- '10'
|
||||
#swift-proxy is used to test gnocchi against an S3 storage backend
|
||||
swift-proxy:
|
||||
charm: swift-proxy
|
||||
num_units: 1
|
||||
options:
|
||||
zone-assignment: manual
|
||||
replicas: 1
|
||||
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '7'
|
||||
swift-storage:
|
||||
charm: cs:~openstack-charmers/swift-storage
|
||||
num_units: 1
|
||||
storage:
|
||||
block-devices: 'cinder,10G'
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
zone: 1
|
||||
to:
|
||||
- '8'
|
||||
vault:
|
||||
charm: cs:~openstack-charmers/vault
|
||||
num_units: 1
|
||||
series: *series
|
||||
to:
|
||||
- '9'
|
||||
relations:
|
||||
- - keystone:shared-db
|
||||
- keystone-mysql-router:shared-db
|
||||
- - keystone-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - gnocchi:shared-db
|
||||
- gnocchi-mysql-router:shared-db
|
||||
- - gnocchi-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - ceilometer:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - ceilometer:identity-credentials
|
||||
- keystone:identity-credentials
|
||||
- - ceilometer:identity-notifications
|
||||
- keystone:identity-notifications
|
||||
- - ceilometer:metric-service
|
||||
- gnocchi:metric-service
|
||||
- - gnocchi:identity-service
|
||||
- keystone:identity-service
|
||||
- - gnocchi:coordinator-memcached
|
||||
- memcached:cache
|
||||
- - swift-proxy:identity-service
|
||||
- keystone:identity-service
|
||||
- - swift-storage:swift-storage
|
||||
- swift-proxy:swift-storage
|
||||
- - vault:shared-db
|
||||
- vault-mysql-router:shared-db
|
||||
- - vault-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - vault:certificates
|
||||
- swift-proxy:certificates
|
||||
- - vault:certificates
|
||||
- gnocchi:certificates
|
||||
- - vault:certificates
|
||||
- ceilometer:certificates
|
||||
- - vault:certificates
|
||||
- keystone:certificates
|
||||
- - vault:certificates
|
||||
- rabbitmq-server:certificates
|
|
@ -1,144 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
series: &series impish
|
||||
|
||||
machines:
|
||||
'0':
|
||||
constraints: mem=3072M
|
||||
'1':
|
||||
constraints: mem=3072M
|
||||
'2':
|
||||
constraints: mem=3072M
|
||||
'3':
|
||||
'4':
|
||||
'5':
|
||||
'6':
|
||||
'7':
|
||||
'8':
|
||||
'9':
|
||||
'10':
|
||||
'11':
|
||||
'12':
|
||||
'13':
|
||||
series: bionic
|
||||
|
||||
# We specify machine placements for these to improve iteration
|
||||
# time, given that machine "0" comes up way before machine "6"
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
gnocchi-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
|
||||
mysql-innodb-cluster:
|
||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
|
||||
ceilometer:
|
||||
charm: cs:~openstack-charmers/ceilometer
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '5'
|
||||
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers/ceph-osd
|
||||
num_units: 3
|
||||
storage:
|
||||
osd-devices: 'cinder,10G'
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '6'
|
||||
- '7'
|
||||
- '8'
|
||||
|
||||
ceph-mon:
|
||||
charm: cs:~openstack-charmers/ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
expected-osd-count: 3
|
||||
monitor-count: '3'
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '9'
|
||||
- '10'
|
||||
- '11'
|
||||
|
||||
gnocchi:
|
||||
series: *series
|
||||
charm: ../../../gnocchi
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '12'
|
||||
|
||||
memcached:
|
||||
charm: cs:~memcached-team/memcached
|
||||
num_units: 1
|
||||
# holding at bionic as memcached doesn't support focal/groovy yet
|
||||
series: bionic
|
||||
to:
|
||||
- '13'
|
||||
|
||||
relations:
|
||||
|
||||
- - 'keystone:shared-db'
|
||||
- 'keystone-mysql-router:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'ceph-osd:mon'
|
||||
- 'ceph-mon:osd'
|
||||
|
||||
- - 'ceilometer:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'ceilometer:identity-credentials'
|
||||
- 'keystone:identity-credentials'
|
||||
|
||||
- - 'ceilometer:identity-notifications'
|
||||
- 'keystone:identity-notifications'
|
||||
|
||||
- - 'ceilometer:metric-service'
|
||||
- 'gnocchi:metric-service'
|
||||
|
||||
- - 'gnocchi:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'gnocchi:shared-db'
|
||||
- 'gnocchi-mysql-router:shared-db'
|
||||
- - 'gnocchi-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'gnocchi:storage-ceph'
|
||||
- 'ceph-mon:client'
|
||||
|
||||
- - 'gnocchi:coordinator-memcached'
|
||||
- 'memcached:cache'
|
|
@ -1,117 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin cloud:xenial-ocata
|
||||
|
||||
series: &series xenial
|
||||
|
||||
machines:
|
||||
0:
|
||||
constraints: "mem=3072M"
|
||||
1: {}
|
||||
2: {}
|
||||
3: {}
|
||||
4: {}
|
||||
5: {}
|
||||
6: {}
|
||||
7: {}
|
||||
8: {}
|
||||
9: {}
|
||||
10: {}
|
||||
11: {}
|
||||
12: {}
|
||||
|
||||
# We specify machine placements for these to improve iteration
|
||||
# time, given that machine "0" comes up way before machine "6"
|
||||
applications:
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '1'
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '2'
|
||||
ceilometer:
|
||||
charm: cs:~openstack-charmers/ceilometer
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers/ceph-osd
|
||||
num_units: 3
|
||||
storage:
|
||||
osd-devices: 'cinder,10G'
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
- '5'
|
||||
- '6'
|
||||
ceph-mon:
|
||||
charm: cs:~openstack-charmers/ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
expected-osd-count: 3
|
||||
monitor-count: '3'
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '7'
|
||||
- '8'
|
||||
- '9'
|
||||
gnocchi:
|
||||
series: *series
|
||||
charm: ../../../gnocchi
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '10'
|
||||
memcached:
|
||||
charm: cs:~memcached-team/memcached
|
||||
num_units: 1
|
||||
to:
|
||||
- '11'
|
||||
mongodb:
|
||||
charm: cs:mongodb
|
||||
num_units: 1
|
||||
to:
|
||||
- '12'
|
||||
relations:
|
||||
- - 'keystone:shared-db'
|
||||
- 'percona-cluster:shared-db'
|
||||
- - 'ceph-osd:mon'
|
||||
- 'ceph-mon:osd'
|
||||
- - 'ceilometer:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
- - 'ceilometer:identity-credentials'
|
||||
- 'keystone:identity-credentials'
|
||||
- - 'ceilometer:identity-notifications'
|
||||
- 'keystone:identity-notifications'
|
||||
- - 'ceilometer:shared-db'
|
||||
- 'mongodb:database'
|
||||
- - 'ceilometer:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
- - 'ceilometer:metric-service'
|
||||
- 'gnocchi:metric-service'
|
||||
- - 'gnocchi:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
- - 'gnocchi:shared-db'
|
||||
- 'percona-cluster:shared-db'
|
||||
- - 'gnocchi:storage-ceph'
|
||||
- 'ceph-mon:client'
|
||||
- - 'gnocchi:coordinator-memcached'
|
||||
- 'memcached:cache'
|
|
@ -1,117 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin cloud:xenial-pike
|
||||
|
||||
series: &series xenial
|
||||
|
||||
machines:
|
||||
0:
|
||||
constraints: "mem=3072M"
|
||||
1: {}
|
||||
2: {}
|
||||
3: {}
|
||||
4: {}
|
||||
5: {}
|
||||
6: {}
|
||||
7: {}
|
||||
8: {}
|
||||
9: {}
|
||||
10: {}
|
||||
11: {}
|
||||
12: {}
|
||||
|
||||
# We specify machine placements for these to improve iteration
|
||||
# time, given that machine "0" comes up way before machine "6"
|
||||
applications:
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '1'
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '2'
|
||||
ceilometer:
|
||||
charm: cs:~openstack-charmers/ceilometer
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers/ceph-osd
|
||||
num_units: 3
|
||||
storage:
|
||||
osd-devices: 'cinder,10G'
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
- '5'
|
||||
- '6'
|
||||
ceph-mon:
|
||||
charm: cs:~openstack-charmers/ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
expected-osd-count: 3
|
||||
monitor-count: '3'
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '7'
|
||||
- '8'
|
||||
- '9'
|
||||
gnocchi:
|
||||
series: *series
|
||||
charm: ../../../gnocchi
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '10'
|
||||
memcached:
|
||||
charm: cs:~memcached-team/memcached
|
||||
num_units: 1
|
||||
to:
|
||||
- '11'
|
||||
mongodb:
|
||||
charm: cs:mongodb
|
||||
num_units: 1
|
||||
to:
|
||||
- '12'
|
||||
relations:
|
||||
- - 'keystone:shared-db'
|
||||
- 'percona-cluster:shared-db'
|
||||
- - 'ceph-osd:mon'
|
||||
- 'ceph-mon:osd'
|
||||
- - 'ceilometer:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
- - 'ceilometer:identity-credentials'
|
||||
- 'keystone:identity-credentials'
|
||||
- - 'ceilometer:identity-notifications'
|
||||
- 'keystone:identity-notifications'
|
||||
- - 'ceilometer:shared-db'
|
||||
- 'mongodb:database'
|
||||
- - 'ceilometer:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
- - 'ceilometer:metric-service'
|
||||
- 'gnocchi:metric-service'
|
||||
- - 'gnocchi:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
- - 'gnocchi:shared-db'
|
||||
- 'percona-cluster:shared-db'
|
||||
- - 'gnocchi:storage-ceph'
|
||||
- 'ceph-mon:client'
|
||||
- - 'gnocchi:coordinator-memcached'
|
||||
- 'memcached:cache'
|
|
@ -1,107 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin cloud:xenial-queens
|
||||
|
||||
series: &series xenial
|
||||
|
||||
machines:
|
||||
0:
|
||||
constraints: "mem=3072M"
|
||||
1: {}
|
||||
2: {}
|
||||
3: {}
|
||||
4: {}
|
||||
5: {}
|
||||
6: {}
|
||||
7: {}
|
||||
8: {}
|
||||
9: {}
|
||||
10: {}
|
||||
11: {}
|
||||
|
||||
# We specify machine placements for these to improve iteration
|
||||
# time, given that machine "0" comes up way before machine "6"
|
||||
applications:
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '1'
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '2'
|
||||
ceilometer:
|
||||
charm: cs:~openstack-charmers/ceilometer
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers/ceph-osd
|
||||
num_units: 3
|
||||
storage:
|
||||
osd-devices: 'cinder,10G'
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
- '5'
|
||||
- '6'
|
||||
ceph-mon:
|
||||
charm: cs:~openstack-charmers/ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
expected-osd-count: 3
|
||||
monitor-count: '3'
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '7'
|
||||
- '8'
|
||||
- '9'
|
||||
gnocchi:
|
||||
series: *series
|
||||
charm: ../../../gnocchi
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '10'
|
||||
memcached:
|
||||
charm: cs:~memcached-team/memcached
|
||||
num_units: 1
|
||||
to:
|
||||
- '11'
|
||||
relations:
|
||||
- - 'keystone:shared-db'
|
||||
- 'percona-cluster:shared-db'
|
||||
- - 'ceph-osd:mon'
|
||||
- 'ceph-mon:osd'
|
||||
- - 'ceilometer:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
- - 'ceilometer:identity-credentials'
|
||||
- 'keystone:identity-credentials'
|
||||
- - 'ceilometer:identity-notifications'
|
||||
- 'keystone:identity-notifications'
|
||||
- - 'ceilometer:metric-service'
|
||||
- 'gnocchi:metric-service'
|
||||
- - 'gnocchi:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
- - 'gnocchi:shared-db'
|
||||
- 'percona-cluster:shared-db'
|
||||
- - 'gnocchi:storage-ceph'
|
||||
- 'ceph-mon:client'
|
||||
- - 'gnocchi:coordinator-memcached'
|
||||
- 'memcached:cache'
|
|
@ -2,31 +2,14 @@ charm_name: gnocchi
|
|||
|
||||
gate_bundles:
|
||||
- bionic-queens
|
||||
- bionic-rocky
|
||||
- bionic-stein
|
||||
- bionic-train
|
||||
- bionic-ussuri
|
||||
- focal-ussuri
|
||||
- focal-wallaby
|
||||
- focal-xena
|
||||
- test-s3: bionic-stein-s3
|
||||
- test-s3: bionic-train-s3
|
||||
- test-s3: bionic-ussuri-s3
|
||||
- test-s3: focal-ussuri-s3
|
||||
- test-s3: focal-wallaby-s3
|
||||
- test-s3: focal-xena-s3
|
||||
- test-s3: groovy-victoria-s3
|
||||
smoke_bundles:
|
||||
- focal-ussuri
|
||||
dev_bundles:
|
||||
- xenial-ocata
|
||||
- xenial-pike
|
||||
- xenial-queens
|
||||
- bionic-rocky
|
||||
- focal-victoria
|
||||
- test-s3: focal-victoria-s3
|
||||
- groovy-victoria
|
||||
- hirsute-wallaby
|
||||
- test-s3: hirsute-wallaby-s3
|
||||
- bionic-train
|
||||
dev_bundles: []
|
||||
configure:
|
||||
- zaza.openstack.charm_tests.ceilometer.setup.basic_setup
|
||||
- test-s3:
|
||||
|
@ -55,7 +38,4 @@ target_deploy_status:
|
|||
workload-status: blocked
|
||||
workload-status-message: Mandatory S3 configuration parameters missing.
|
||||
tests_options:
|
||||
force_deploy:
|
||||
- groovy-victoria
|
||||
- impish-xena
|
||||
- impish-xena-s3
|
||||
force_deploy: []
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
boto3<1.17.0 # pin for py35 compatability
|
||||
|
||||
git+https://github.com/openstack/charms.openstack.git@stable/21.10#egg=charms.openstack
|
||||
git+https://github.com/openstack/charms.openstack.git@stable/train#egg=charms.openstack
|
||||
|
||||
git+https://github.com/juju/charm-helpers.git@stable/21.10#egg=charmhelpers
|
||||
git+https://github.com/juju/charm-helpers@stable/train#egg=charmhelpers
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
# choices of *requirements.txt files for OpenStack Charms:
|
||||
# https://github.com/openstack-charmers/release-tools
|
||||
#
|
||||
pyparsing<3.0.0 # cffi needs pyparsing < 3.0.0.
|
||||
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
|
||||
|
||||
|
@ -34,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@stable/21.10#egg=charms.openstack
|
||||
git+https://github.com/openstack/charms.openstack.git@stable/train#egg=charms.openstack
|
||||
#
|
||||
# Revisit for removal / mock improvement:
|
||||
#
|
||||
|
|
30
tox.ini
30
tox.ini
|
@ -37,11 +37,24 @@ setenv = VIRTUAL_ENV={envdir}
|
|||
passenv = http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY
|
||||
install_command =
|
||||
{toxinidir}/pip.sh install {opts} {packages}
|
||||
allowlist_externals =
|
||||
charmcraft
|
||||
bash
|
||||
tox
|
||||
rename.sh
|
||||
deps =
|
||||
-r{toxinidir}/requirements.txt
|
||||
|
||||
[testenv:build]
|
||||
basepython = python3
|
||||
deps = -r{toxinidir}/build-requirements.txt
|
||||
commands =
|
||||
charmcraft clean
|
||||
charmcraft -v build
|
||||
{toxinidir}/rename.sh
|
||||
|
||||
[testenv:build-reactive]
|
||||
basepython = python3
|
||||
commands =
|
||||
charm-build --log-level DEBUG --use-lock-file-branches -o {toxinidir}/build/builds src {posargs}
|
||||
|
||||
|
@ -55,11 +68,6 @@ basepython = python3
|
|||
deps = -r{toxinidir}/test-requirements.txt
|
||||
commands = stestr run --slowest {posargs}
|
||||
|
||||
[testenv:py35]
|
||||
basepython = python3.5
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
commands = stestr run --slowest {posargs}
|
||||
|
||||
[testenv:py36]
|
||||
basepython = python3.6
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
|
@ -81,6 +89,18 @@ deps = flake8==3.9.2
|
|||
charm-tools==2.8.3
|
||||
commands = flake8 {posargs} src unit_tests
|
||||
|
||||
[testenv:func-target]
|
||||
# Hack to get functional tests working in the charmcraft
|
||||
# world. We should fix this.
|
||||
basepython = python3
|
||||
passenv = HOME TERM CS_* OS_* TEST_*
|
||||
deps = -r{toxinidir}/src/test-requirements.txt
|
||||
changedir = {toxinidir}/src
|
||||
commands =
|
||||
bash -c "if [ ! -f ../*.charm ]; then echo 'Charm does not exist. Run tox -e build'; exit 1; fi"
|
||||
tox --version
|
||||
tox -e func-target {posargs}
|
||||
|
||||
[testenv:cover]
|
||||
# Technique based heavily upon
|
||||
# https://github.com/openstack/nova/blob/master/tox.ini
|
||||
|
|
Loading…
Reference in New Issue