Migrate charm charmhub for stable/ussuri
- start from stable/ussuri branch - Do charmcraft, osci, zuul changes - Modify libs to point to stable/ussuri for: - charmhelpers - charms.openstack (as needed) - zaza & zaza.openstack.tests - Remove unsupported test bundles - migration bundles to charmhub.io (ch: prefix + channels) - Build on 18.04 amd64 - Run on 18.04 amd64, s390x, ppc64el, arm64 - Run on 20.04 amd64, s390x, ppc64el, arm64 Change-Id: Ic99a6dd7aab2d6be4238628fbf27dbac36db08ae
This commit is contained in:
parent
ae2f473ce2
commit
3fc02fc546
|
@ -7,3 +7,4 @@ bin
|
||||||
*.pyc
|
*.pyc
|
||||||
func-results.json
|
func-results.json
|
||||||
.stestr
|
.stestr
|
||||||
|
*.charm
|
||||||
|
|
|
@ -3,4 +3,4 @@ host=review.opendev.org
|
||||||
port=29418
|
port=29418
|
||||||
project=openstack/charm-cinder-backup.git
|
project=openstack/charm-cinder-backup.git
|
||||||
|
|
||||||
defaultbranch=stable/21.10
|
defaultbranch=stable/ussuri
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- python35-charm-jobs
|
|
||||||
- openstack-python3-ussuri-jobs
|
- openstack-python3-ussuri-jobs
|
||||||
- openstack-cover-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.
|
|
@ -1,4 +1,4 @@
|
||||||
repo: https://github.com/juju/charm-helpers@stable/21.10
|
repo: https://github.com/juju/charm-helpers@stable/ussuri
|
||||||
destination: hooks/charmhelpers
|
destination: hooks/charmhelpers
|
||||||
include:
|
include:
|
||||||
- core
|
- core
|
||||||
|
|
|
@ -0,0 +1,33 @@
|
||||||
|
type: charm
|
||||||
|
|
||||||
|
parts:
|
||||||
|
charm:
|
||||||
|
plugin: dump
|
||||||
|
source: .
|
||||||
|
prime:
|
||||||
|
- actions/*
|
||||||
|
- files/*
|
||||||
|
- hooks/*
|
||||||
|
- lib/*
|
||||||
|
- templates/.*
|
||||||
|
- config.yaml
|
||||||
|
- copyright
|
||||||
|
- icon.svg
|
||||||
|
- LICENSE
|
||||||
|
- Makefile
|
||||||
|
- metadata.yaml
|
||||||
|
- README.md
|
||||||
|
|
||||||
|
bases:
|
||||||
|
- build-on:
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "18.04"
|
||||||
|
architectures:
|
||||||
|
- amd64
|
||||||
|
run-on:
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "18.04"
|
||||||
|
architectures: [amd64, s390x, ppc64el, arm64]
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "20.04"
|
||||||
|
architectures: [amd64, s390x, ppc64el, arm64]
|
|
@ -8,12 +8,8 @@ description: |
|
||||||
tags:
|
tags:
|
||||||
- miscellaneous
|
- miscellaneous
|
||||||
series:
|
series:
|
||||||
- xenial
|
|
||||||
- bionic
|
- bionic
|
||||||
- focal
|
- focal
|
||||||
- groovy
|
|
||||||
- hirsute
|
|
||||||
- impish
|
|
||||||
subordinate: true
|
subordinate: true
|
||||||
provides:
|
provides:
|
||||||
backup-backend:
|
backup-backend:
|
||||||
|
|
23
osci.yaml
23
osci.yaml
|
@ -1,17 +1,14 @@
|
||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- charm-unit-jobs
|
- charm-unit-jobs-py36
|
||||||
# Revert this to the project-template when trusty is actually
|
- charm-unit-jobs-py38
|
||||||
# removed from the charm-functional-jobs template
|
- charm-train-functional-jobs
|
||||||
# - charm-functional-jobs
|
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- xenial-mitaka
|
- bionic-ussuri
|
||||||
- bionic-queens
|
- focal-ussuri:
|
||||||
- bionic-stein
|
voting: false
|
||||||
- bionic-train
|
vars:
|
||||||
- bionic-ussuri
|
needs_charm_build: true
|
||||||
- focal-victoria
|
charm_build_name: cinder-backup
|
||||||
- focal-wallaby
|
build_type: charmcraft
|
||||||
- groovy-victoria
|
|
||||||
#- hirsute-wallaby
|
|
||||||
|
|
|
@ -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
|
|
@ -7,6 +7,7 @@
|
||||||
# requirements. They are intertwined. Also, Zaza itself should specify
|
# requirements. They are intertwined. Also, Zaza itself should specify
|
||||||
# all of its own requirements and if it doesn't, fix it there.
|
# all of its own requirements and if it doesn't, fix it there.
|
||||||
#
|
#
|
||||||
|
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.
|
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
|
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
||||||
|
|
||||||
|
@ -37,11 +38,12 @@ oslo.utils<=3.41.0;python_version<'3.6'
|
||||||
|
|
||||||
coverage>=4.5.2
|
coverage>=4.5.2
|
||||||
pyudev # for ceph-* charm unit tests (need to fix the ceph-* charm unit tests/mocking)
|
pyudev # for ceph-* charm unit tests (need to fix the ceph-* charm unit tests/mocking)
|
||||||
git+https://github.com/openstack-charmers/zaza.git@stable/21.10#egg=zaza
|
git+https://github.com/openstack-charmers/zaza.git@stable/ussuri#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-openstack-tests.git@stable/ussuri#egg=zaza.openstack
|
||||||
|
|
||||||
# Needed for charm-glance:
|
# Needed for charm-glance:
|
||||||
git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.6'
|
git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.8'
|
||||||
|
tempest<31.0.0;python_version<'3.8' and python_version>='3.6'
|
||||||
tempest<24.0.0;python_version<'3.6'
|
tempest<24.0.0;python_version<'3.6'
|
||||||
|
|
||||||
croniter # needed for charm-rabbitmq-server unit tests
|
croniter # needed for charm-rabbitmq-server unit tests
|
||||||
|
|
|
@ -1,77 +0,0 @@
|
||||||
series: bionic
|
|
||||||
relations:
|
|
||||||
- - cinder-backup:ceph
|
|
||||||
- ceph-mon:client
|
|
||||||
- - cinder-ceph:ceph
|
|
||||||
- ceph-mon:client
|
|
||||||
- - ceph-osd:mon
|
|
||||||
- ceph-mon:osd
|
|
||||||
- - cinder:storage-backend
|
|
||||||
- cinder-ceph:storage-backend
|
|
||||||
- - cinder:backup-backend
|
|
||||||
- cinder-backup:backup-backend
|
|
||||||
- - keystone:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - cinder:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - cinder:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - cinder:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - glance:image-service
|
|
||||||
- nova-compute:image-service
|
|
||||||
- - glance:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - glance:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - nova-compute:ceph-access
|
|
||||||
- cinder-ceph:ceph-access
|
|
||||||
- - nova-compute:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
applications:
|
|
||||||
percona-cluster:
|
|
||||||
charm: cs:~openstack-charmers/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
innodb-buffer-pool-size: 256M
|
|
||||||
max-connections: 1000
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers/keystone
|
|
||||||
num_units: 1
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
ceph-mon:
|
|
||||||
charm: cs:~openstack-charmers/ceph-mon
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
monitor-count: '3'
|
|
||||||
auth-supported: 'none'
|
|
||||||
ceph-osd:
|
|
||||||
charm: cs:~openstack-charmers/ceph-osd
|
|
||||||
num_units: 3
|
|
||||||
storage:
|
|
||||||
osd-devices: 'cinder,10G'
|
|
||||||
options:
|
|
||||||
osd-devices: '/dev/test-non-existent'
|
|
||||||
cinder:
|
|
||||||
charm: cs:~openstack-charmers/cinder
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
block-device: 'None'
|
|
||||||
glance-api-version: '2'
|
|
||||||
cinder-backup:
|
|
||||||
charm: ../../../cinder-backup
|
|
||||||
series: bionic
|
|
||||||
options:
|
|
||||||
ceph-osd-replication-count: 3
|
|
||||||
cinder-ceph:
|
|
||||||
charm: cs:~openstack-charmers/cinder-ceph
|
|
||||||
options:
|
|
||||||
ceph-osd-replication-count: 3
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 1
|
|
|
@ -1,83 +0,0 @@
|
||||||
series: bionic
|
|
||||||
relations:
|
|
||||||
- - cinder-backup:ceph
|
|
||||||
- ceph-mon:client
|
|
||||||
- - cinder-ceph:ceph
|
|
||||||
- ceph-mon:client
|
|
||||||
- - ceph-osd:mon
|
|
||||||
- ceph-mon:osd
|
|
||||||
- - cinder:storage-backend
|
|
||||||
- cinder-ceph:storage-backend
|
|
||||||
- - cinder:backup-backend
|
|
||||||
- cinder-backup:backup-backend
|
|
||||||
- - keystone:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - cinder:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - cinder:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - cinder:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - glance:image-service
|
|
||||||
- nova-compute:image-service
|
|
||||||
- - glance:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - glance:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - nova-compute:ceph-access
|
|
||||||
- cinder-ceph:ceph-access
|
|
||||||
- - nova-compute:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
applications:
|
|
||||||
percona-cluster:
|
|
||||||
charm: cs:~openstack-charmers/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
innodb-buffer-pool-size: 256M
|
|
||||||
max-connections: 1000
|
|
||||||
source: cloud:bionic-rocky
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:bionic-rocky
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
ceph-mon:
|
|
||||||
charm: cs:~openstack-charmers/ceph-mon
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
monitor-count: '3'
|
|
||||||
auth-supported: 'none'
|
|
||||||
source: cloud:bionic-rocky
|
|
||||||
ceph-osd:
|
|
||||||
charm: cs:~openstack-charmers/ceph-osd
|
|
||||||
num_units: 3
|
|
||||||
storage:
|
|
||||||
osd-devices: 'cinder,10G'
|
|
||||||
options:
|
|
||||||
osd-devices: '/dev/test-non-existent'
|
|
||||||
source: cloud:bionic-rocky
|
|
||||||
cinder:
|
|
||||||
charm: cs:~openstack-charmers/cinder
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
block-device: 'None'
|
|
||||||
glance-api-version: '2'
|
|
||||||
openstack-origin: cloud:bionic-rocky
|
|
||||||
cinder-backup:
|
|
||||||
charm: ../../../cinder-backup
|
|
||||||
series: bionic
|
|
||||||
options:
|
|
||||||
ceph-osd-replication-count: 3
|
|
||||||
cinder-ceph:
|
|
||||||
charm: cs:~openstack-charmers/cinder-ceph
|
|
||||||
options:
|
|
||||||
ceph-osd-replication-count: 3
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 1
|
|
|
@ -1,83 +0,0 @@
|
||||||
series: bionic
|
|
||||||
relations:
|
|
||||||
- - cinder-backup:ceph
|
|
||||||
- ceph-mon:client
|
|
||||||
- - cinder-ceph:ceph
|
|
||||||
- ceph-mon:client
|
|
||||||
- - ceph-osd:mon
|
|
||||||
- ceph-mon:osd
|
|
||||||
- - cinder:storage-backend
|
|
||||||
- cinder-ceph:storage-backend
|
|
||||||
- - cinder:backup-backend
|
|
||||||
- cinder-backup:backup-backend
|
|
||||||
- - keystone:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - cinder:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - cinder:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - cinder:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - glance:image-service
|
|
||||||
- nova-compute:image-service
|
|
||||||
- - glance:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - glance:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - nova-compute:ceph-access
|
|
||||||
- cinder-ceph:ceph-access
|
|
||||||
- - nova-compute:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
applications:
|
|
||||||
percona-cluster:
|
|
||||||
charm: cs:~openstack-charmers/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
innodb-buffer-pool-size: 256M
|
|
||||||
max-connections: 1000
|
|
||||||
source: cloud:bionic-stein
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:bionic-stein
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
ceph-mon:
|
|
||||||
charm: cs:~openstack-charmers/ceph-mon
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
monitor-count: '3'
|
|
||||||
auth-supported: 'none'
|
|
||||||
source: cloud:bionic-stein
|
|
||||||
ceph-osd:
|
|
||||||
charm: cs:~openstack-charmers/ceph-osd
|
|
||||||
num_units: 3
|
|
||||||
storage:
|
|
||||||
osd-devices: 'cinder,10G'
|
|
||||||
options:
|
|
||||||
osd-devices: '/dev/test-non-existent'
|
|
||||||
source: cloud:bionic-stein
|
|
||||||
cinder:
|
|
||||||
charm: cs:~openstack-charmers/cinder
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
block-device: 'None'
|
|
||||||
glance-api-version: '2'
|
|
||||||
openstack-origin: cloud:bionic-stein
|
|
||||||
cinder-backup:
|
|
||||||
charm: ../../../cinder-backup
|
|
||||||
series: bionic
|
|
||||||
options:
|
|
||||||
ceph-osd-replication-count: 3
|
|
||||||
cinder-ceph:
|
|
||||||
charm: cs:~openstack-charmers/cinder-ceph
|
|
||||||
options:
|
|
||||||
ceph-osd-replication-count: 3
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 1
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
local_overlay_enabled: False
|
||||||
|
|
||||||
series: bionic
|
series: bionic
|
||||||
relations:
|
relations:
|
||||||
- - cinder-backup:ceph
|
- - cinder-backup:ceph
|
||||||
|
@ -30,53 +32,62 @@ relations:
|
||||||
- rabbitmq-server:amqp
|
- rabbitmq-server:amqp
|
||||||
applications:
|
applications:
|
||||||
percona-cluster:
|
percona-cluster:
|
||||||
charm: cs:~openstack-charmers/percona-cluster
|
charm: ch:percona-cluster
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
innodb-buffer-pool-size: 256M
|
innodb-buffer-pool-size: 256M
|
||||||
max-connections: 1000
|
max-connections: 1000
|
||||||
source: cloud:bionic-train
|
source: cloud:bionic-train
|
||||||
|
channel: 5.7/edge
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers/keystone
|
charm: ch:keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: cloud:bionic-train
|
openstack-origin: cloud:bionic-train
|
||||||
|
channel: ussuri/edge
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
charm: ch:rabbitmq-server
|
||||||
num_units: 1
|
num_units: 1
|
||||||
|
channel: 3.8/edge
|
||||||
ceph-mon:
|
ceph-mon:
|
||||||
charm: cs:~openstack-charmers/ceph-mon
|
charm: ch:ceph-mon
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
options:
|
||||||
monitor-count: '3'
|
monitor-count: '3'
|
||||||
source: cloud:bionic-train
|
source: cloud:bionic-train
|
||||||
|
channel: octopus/edge
|
||||||
ceph-osd:
|
ceph-osd:
|
||||||
charm: cs:~openstack-charmers/ceph-osd
|
charm: ch:ceph-osd
|
||||||
num_units: 3
|
num_units: 3
|
||||||
storage:
|
storage:
|
||||||
osd-devices: 'cinder,10G'
|
osd-devices: 'cinder,10G'
|
||||||
options:
|
options:
|
||||||
osd-devices: '/dev/test-non-existent'
|
osd-devices: '/dev/test-non-existent'
|
||||||
source: cloud:bionic-train
|
source: cloud:bionic-train
|
||||||
|
channel: octopus/edge
|
||||||
cinder:
|
cinder:
|
||||||
charm: cs:~openstack-charmers/cinder
|
charm: ch:cinder
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
block-device: 'None'
|
block-device: 'None'
|
||||||
glance-api-version: '2'
|
glance-api-version: '2'
|
||||||
openstack-origin: cloud:bionic-train
|
openstack-origin: cloud:bionic-train
|
||||||
|
channel: ussuri/edge
|
||||||
cinder-backup:
|
cinder-backup:
|
||||||
charm: ../../../cinder-backup
|
charm: ../../cinder-backup.charm
|
||||||
series: bionic
|
series: bionic
|
||||||
options:
|
options:
|
||||||
ceph-osd-replication-count: 3
|
ceph-osd-replication-count: 3
|
||||||
cinder-ceph:
|
cinder-ceph:
|
||||||
charm: cs:~openstack-charmers/cinder-ceph
|
charm: ch:cinder-ceph
|
||||||
options:
|
options:
|
||||||
ceph-osd-replication-count: 3
|
ceph-osd-replication-count: 3
|
||||||
|
channel: ussuri/edge
|
||||||
glance:
|
glance:
|
||||||
charm: cs:~openstack-charmers/glance
|
charm: ch:glance
|
||||||
num_units: 1
|
num_units: 1
|
||||||
|
channel: ussuri/edge
|
||||||
nova-compute:
|
nova-compute:
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
charm: ch:nova-compute
|
||||||
num_units: 1
|
num_units: 1
|
||||||
|
channel: ussuri/edge
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
local_overlay_enabled: False
|
||||||
|
|
||||||
series: bionic
|
series: bionic
|
||||||
relations:
|
relations:
|
||||||
- - cinder-backup:ceph
|
- - cinder-backup:ceph
|
||||||
|
@ -30,53 +32,62 @@ relations:
|
||||||
- rabbitmq-server:amqp
|
- rabbitmq-server:amqp
|
||||||
applications:
|
applications:
|
||||||
percona-cluster:
|
percona-cluster:
|
||||||
charm: cs:~openstack-charmers/percona-cluster
|
charm: ch:percona-cluster
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
innodb-buffer-pool-size: 256M
|
innodb-buffer-pool-size: 256M
|
||||||
max-connections: 1000
|
max-connections: 1000
|
||||||
source: cloud:bionic-train
|
source: cloud:bionic-train
|
||||||
|
channel: 5.7/edge
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers/keystone
|
charm: ch:keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: cloud:bionic-train
|
openstack-origin: cloud:bionic-train
|
||||||
|
channel: ussuri/edge
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
charm: ch:rabbitmq-server
|
||||||
num_units: 1
|
num_units: 1
|
||||||
|
channel: 3.8/edge
|
||||||
ceph-mon:
|
ceph-mon:
|
||||||
charm: cs:~openstack-charmers/ceph-mon
|
charm: ch:ceph-mon
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
options:
|
||||||
monitor-count: '3'
|
monitor-count: '3'
|
||||||
source: cloud:bionic-train
|
source: cloud:bionic-train
|
||||||
|
channel: octopus/edge
|
||||||
ceph-osd:
|
ceph-osd:
|
||||||
charm: cs:~openstack-charmers/ceph-osd
|
charm: ch:ceph-osd
|
||||||
num_units: 3
|
num_units: 3
|
||||||
storage:
|
storage:
|
||||||
osd-devices: 'cinder,10G'
|
osd-devices: 'cinder,10G'
|
||||||
options:
|
options:
|
||||||
osd-devices: '/dev/test-non-existent'
|
osd-devices: '/dev/test-non-existent'
|
||||||
source: cloud:bionic-train
|
source: cloud:bionic-train
|
||||||
|
channel: octopus/edge
|
||||||
cinder:
|
cinder:
|
||||||
charm: cs:~openstack-charmers/cinder
|
charm: ch:cinder
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
block-device: 'None'
|
block-device: 'None'
|
||||||
glance-api-version: '2'
|
glance-api-version: '2'
|
||||||
openstack-origin: cloud:bionic-train
|
openstack-origin: cloud:bionic-train
|
||||||
|
channel: ussuri/edge
|
||||||
cinder-backup:
|
cinder-backup:
|
||||||
charm: ../../../cinder-backup
|
charm: ../../cinder-backup.charm
|
||||||
series: bionic
|
series: bionic
|
||||||
options:
|
options:
|
||||||
ceph-osd-replication-count: 3
|
ceph-osd-replication-count: 3
|
||||||
cinder-ceph:
|
cinder-ceph:
|
||||||
charm: cs:~openstack-charmers/cinder-ceph
|
charm: ch:cinder-ceph
|
||||||
options:
|
options:
|
||||||
ceph-osd-replication-count: 3
|
ceph-osd-replication-count: 3
|
||||||
|
channel: ussuri/edge
|
||||||
glance:
|
glance:
|
||||||
charm: cs:~openstack-charmers/glance
|
charm: ch:glance
|
||||||
num_units: 1
|
num_units: 1
|
||||||
|
channel: ussuri/edge
|
||||||
nova-compute:
|
nova-compute:
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
charm: ch:nova-compute
|
||||||
num_units: 1
|
num_units: 1
|
||||||
|
channel: ussuri/edge
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
local_overlay_enabled: False
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
openstack-origin: &openstack-origin distro
|
openstack-origin: &openstack-origin distro
|
||||||
|
|
||||||
|
@ -27,14 +29,17 @@ machines:
|
||||||
applications:
|
applications:
|
||||||
|
|
||||||
keystone-mysql-router:
|
keystone-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0/edge
|
||||||
cinder-mysql-router:
|
cinder-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0/edge
|
||||||
glance-mysql-router:
|
glance-mysql-router:
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
charm: ch:mysql-router
|
||||||
|
channel: 8.0/edge
|
||||||
|
|
||||||
mysql-innodb-cluster:
|
mysql-innodb-cluster:
|
||||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
charm: ch:mysql-innodb-cluster
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
options:
|
||||||
source: *openstack-origin
|
source: *openstack-origin
|
||||||
|
@ -42,23 +47,26 @@ applications:
|
||||||
- '0'
|
- '0'
|
||||||
- '1'
|
- '1'
|
||||||
- '2'
|
- '2'
|
||||||
|
channel: 8.0/edge
|
||||||
|
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers/keystone
|
charm: ch:keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '3'
|
- '3'
|
||||||
|
channel: ussuri/edge
|
||||||
|
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
charm: ch:rabbitmq-server
|
||||||
num_units: 1
|
num_units: 1
|
||||||
to:
|
to:
|
||||||
- '4'
|
- '4'
|
||||||
|
channel: 3.8/edge
|
||||||
|
|
||||||
ceph-mon:
|
ceph-mon:
|
||||||
charm: cs:~openstack-charmers/ceph-mon
|
charm: ch:ceph-mon
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
options:
|
||||||
monitor-count: '3'
|
monitor-count: '3'
|
||||||
|
@ -67,9 +75,10 @@ applications:
|
||||||
- '5'
|
- '5'
|
||||||
- '6'
|
- '6'
|
||||||
- '7'
|
- '7'
|
||||||
|
channel: octopus/edge
|
||||||
|
|
||||||
ceph-osd:
|
ceph-osd:
|
||||||
charm: cs:~openstack-charmers/ceph-osd
|
charm: ch:ceph-osd
|
||||||
num_units: 3
|
num_units: 3
|
||||||
storage:
|
storage:
|
||||||
osd-devices: 'cinder,10G'
|
osd-devices: 'cinder,10G'
|
||||||
|
@ -80,9 +89,10 @@ applications:
|
||||||
- '8'
|
- '8'
|
||||||
- '9'
|
- '9'
|
||||||
- '10'
|
- '10'
|
||||||
|
channel: octopus/edge
|
||||||
|
|
||||||
cinder:
|
cinder:
|
||||||
charm: cs:~openstack-charmers/cinder
|
charm: ch:cinder
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
block-device: 'None'
|
block-device: 'None'
|
||||||
|
@ -90,28 +100,32 @@ applications:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
to:
|
to:
|
||||||
- '11'
|
- '11'
|
||||||
|
channel: ussuri/edge
|
||||||
|
|
||||||
cinder-backup:
|
cinder-backup:
|
||||||
charm: ../../../cinder-backup
|
charm: ../../cinder-backup.charm
|
||||||
options:
|
options:
|
||||||
ceph-osd-replication-count: 3
|
ceph-osd-replication-count: 3
|
||||||
|
|
||||||
cinder-ceph:
|
cinder-ceph:
|
||||||
charm: cs:~openstack-charmers/cinder-ceph
|
charm: ch:cinder-ceph
|
||||||
options:
|
options:
|
||||||
ceph-osd-replication-count: 3
|
ceph-osd-replication-count: 3
|
||||||
|
channel: ussuri/edge
|
||||||
|
|
||||||
glance:
|
glance:
|
||||||
charm: cs:~openstack-charmers/glance
|
charm: ch:glance
|
||||||
num_units: 1
|
num_units: 1
|
||||||
to:
|
to:
|
||||||
- '12'
|
- '12'
|
||||||
|
channel: ussuri/edge
|
||||||
|
|
||||||
nova-compute:
|
nova-compute:
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
charm: ch:nova-compute
|
||||||
num_units: 1
|
num_units: 1
|
||||||
to:
|
to:
|
||||||
- '13'
|
- '13'
|
||||||
|
channel: ussuri/edge
|
||||||
|
|
||||||
relations:
|
relations:
|
||||||
|
|
||||||
|
|
|
@ -1,164 +0,0 @@
|
||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin cloud:focal-victoria
|
|
||||||
|
|
||||||
series: focal
|
|
||||||
|
|
||||||
comment:
|
|
||||||
- 'machines section to decide order of deployment. database sooner = faster'
|
|
||||||
machines:
|
|
||||||
'0':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'1':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'2':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'3':
|
|
||||||
'4':
|
|
||||||
'5':
|
|
||||||
'6':
|
|
||||||
'7':
|
|
||||||
'8':
|
|
||||||
'9':
|
|
||||||
'10':
|
|
||||||
'11':
|
|
||||||
'12':
|
|
||||||
'13':
|
|
||||||
|
|
||||||
applications:
|
|
||||||
|
|
||||||
keystone-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
cinder-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
glance-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'
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
|
|
||||||
ceph-mon:
|
|
||||||
charm: cs:~openstack-charmers/ceph-mon
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
monitor-count: '3'
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
- '6'
|
|
||||||
- '7'
|
|
||||||
|
|
||||||
ceph-osd:
|
|
||||||
charm: cs:~openstack-charmers/ceph-osd
|
|
||||||
num_units: 3
|
|
||||||
storage:
|
|
||||||
osd-devices: 'cinder,10G'
|
|
||||||
options:
|
|
||||||
osd-devices: '/dev/test-non-existent'
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '8'
|
|
||||||
- '9'
|
|
||||||
- '10'
|
|
||||||
|
|
||||||
cinder:
|
|
||||||
charm: cs:~openstack-charmers/cinder
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
block-device: 'None'
|
|
||||||
glance-api-version: '2'
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '11'
|
|
||||||
|
|
||||||
cinder-backup:
|
|
||||||
charm: ../../../cinder-backup
|
|
||||||
options:
|
|
||||||
ceph-osd-replication-count: 3
|
|
||||||
|
|
||||||
cinder-ceph:
|
|
||||||
charm: cs:~openstack-charmers/cinder-ceph
|
|
||||||
options:
|
|
||||||
ceph-osd-replication-count: 3
|
|
||||||
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '12'
|
|
||||||
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '13'
|
|
||||||
|
|
||||||
relations:
|
|
||||||
|
|
||||||
- - 'cinder-backup:ceph'
|
|
||||||
- 'ceph-mon:client'
|
|
||||||
|
|
||||||
- - 'cinder-ceph:ceph'
|
|
||||||
- 'ceph-mon:client'
|
|
||||||
|
|
||||||
- - 'ceph-osd:mon'
|
|
||||||
- 'ceph-mon:osd'
|
|
||||||
|
|
||||||
- - 'cinder:storage-backend'
|
|
||||||
- 'cinder-ceph:storage-backend'
|
|
||||||
|
|
||||||
- - 'cinder:backup-backend'
|
|
||||||
- 'cinder-backup:backup-backend'
|
|
||||||
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'keystone-mysql-router:shared-db'
|
|
||||||
- - 'keystone-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'cinder:shared-db'
|
|
||||||
- 'cinder-mysql-router:shared-db'
|
|
||||||
- - 'cinder-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'cinder:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'cinder:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'glance:image-service'
|
|
||||||
- 'nova-compute:image-service'
|
|
||||||
|
|
||||||
- - 'glance:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'glance:shared-db'
|
|
||||||
- 'glance-mysql-router:shared-db'
|
|
||||||
- - 'glance-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'nova-compute:ceph-access'
|
|
||||||
- 'cinder-ceph:ceph-access'
|
|
||||||
|
|
||||||
- - 'nova-compute:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
|
@ -1,164 +0,0 @@
|
||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin cloud:focal-wallaby
|
|
||||||
|
|
||||||
series: focal
|
|
||||||
|
|
||||||
comment:
|
|
||||||
- 'machines section to decide order of deployment. database sooner = faster'
|
|
||||||
machines:
|
|
||||||
'0':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'1':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'2':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'3':
|
|
||||||
'4':
|
|
||||||
'5':
|
|
||||||
'6':
|
|
||||||
'7':
|
|
||||||
'8':
|
|
||||||
'9':
|
|
||||||
'10':
|
|
||||||
'11':
|
|
||||||
'12':
|
|
||||||
'13':
|
|
||||||
|
|
||||||
applications:
|
|
||||||
|
|
||||||
keystone-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
cinder-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
glance-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'
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
|
|
||||||
ceph-mon:
|
|
||||||
charm: cs:~openstack-charmers/ceph-mon
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
monitor-count: '3'
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
- '6'
|
|
||||||
- '7'
|
|
||||||
|
|
||||||
ceph-osd:
|
|
||||||
charm: cs:~openstack-charmers/ceph-osd
|
|
||||||
num_units: 3
|
|
||||||
storage:
|
|
||||||
osd-devices: 'cinder,10G'
|
|
||||||
options:
|
|
||||||
osd-devices: '/dev/test-non-existent'
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '8'
|
|
||||||
- '9'
|
|
||||||
- '10'
|
|
||||||
|
|
||||||
cinder:
|
|
||||||
charm: cs:~openstack-charmers/cinder
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
block-device: 'None'
|
|
||||||
glance-api-version: '2'
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '11'
|
|
||||||
|
|
||||||
cinder-backup:
|
|
||||||
charm: ../../../cinder-backup
|
|
||||||
options:
|
|
||||||
ceph-osd-replication-count: 3
|
|
||||||
|
|
||||||
cinder-ceph:
|
|
||||||
charm: cs:~openstack-charmers/cinder-ceph
|
|
||||||
options:
|
|
||||||
ceph-osd-replication-count: 3
|
|
||||||
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '12'
|
|
||||||
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '13'
|
|
||||||
|
|
||||||
relations:
|
|
||||||
|
|
||||||
- - 'cinder-backup:ceph'
|
|
||||||
- 'ceph-mon:client'
|
|
||||||
|
|
||||||
- - 'cinder-ceph:ceph'
|
|
||||||
- 'ceph-mon:client'
|
|
||||||
|
|
||||||
- - 'ceph-osd:mon'
|
|
||||||
- 'ceph-mon:osd'
|
|
||||||
|
|
||||||
- - 'cinder:storage-backend'
|
|
||||||
- 'cinder-ceph:storage-backend'
|
|
||||||
|
|
||||||
- - 'cinder:backup-backend'
|
|
||||||
- 'cinder-backup:backup-backend'
|
|
||||||
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'keystone-mysql-router:shared-db'
|
|
||||||
- - 'keystone-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'cinder:shared-db'
|
|
||||||
- 'cinder-mysql-router:shared-db'
|
|
||||||
- - 'cinder-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'cinder:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'cinder:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'glance:image-service'
|
|
||||||
- 'nova-compute:image-service'
|
|
||||||
|
|
||||||
- - 'glance:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'glance:shared-db'
|
|
||||||
- 'glance-mysql-router:shared-db'
|
|
||||||
- - 'glance-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'nova-compute:ceph-access'
|
|
||||||
- 'cinder-ceph:ceph-access'
|
|
||||||
|
|
||||||
- - 'nova-compute:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
|
@ -1,164 +0,0 @@
|
||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin distro
|
|
||||||
|
|
||||||
series: groovy
|
|
||||||
|
|
||||||
comment:
|
|
||||||
- 'machines section to decide order of deployment. database sooner = faster'
|
|
||||||
machines:
|
|
||||||
'0':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'1':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'2':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'3':
|
|
||||||
'4':
|
|
||||||
'5':
|
|
||||||
'6':
|
|
||||||
'7':
|
|
||||||
'8':
|
|
||||||
'9':
|
|
||||||
'10':
|
|
||||||
'11':
|
|
||||||
'12':
|
|
||||||
'13':
|
|
||||||
|
|
||||||
applications:
|
|
||||||
|
|
||||||
keystone-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
cinder-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
glance-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'
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
|
|
||||||
ceph-mon:
|
|
||||||
charm: cs:~openstack-charmers/ceph-mon
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
monitor-count: '3'
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
- '6'
|
|
||||||
- '7'
|
|
||||||
|
|
||||||
ceph-osd:
|
|
||||||
charm: cs:~openstack-charmers/ceph-osd
|
|
||||||
num_units: 3
|
|
||||||
storage:
|
|
||||||
osd-devices: 'cinder,10G'
|
|
||||||
options:
|
|
||||||
osd-devices: '/dev/test-non-existent'
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '8'
|
|
||||||
- '9'
|
|
||||||
- '10'
|
|
||||||
|
|
||||||
cinder:
|
|
||||||
charm: cs:~openstack-charmers/cinder
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
block-device: 'None'
|
|
||||||
glance-api-version: '2'
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '11'
|
|
||||||
|
|
||||||
cinder-backup:
|
|
||||||
charm: ../../../cinder-backup
|
|
||||||
options:
|
|
||||||
ceph-osd-replication-count: 3
|
|
||||||
|
|
||||||
cinder-ceph:
|
|
||||||
charm: cs:~openstack-charmers/cinder-ceph
|
|
||||||
options:
|
|
||||||
ceph-osd-replication-count: 3
|
|
||||||
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '12'
|
|
||||||
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '13'
|
|
||||||
|
|
||||||
relations:
|
|
||||||
|
|
||||||
- - 'cinder-backup:ceph'
|
|
||||||
- 'ceph-mon:client'
|
|
||||||
|
|
||||||
- - 'cinder-ceph:ceph'
|
|
||||||
- 'ceph-mon:client'
|
|
||||||
|
|
||||||
- - 'ceph-osd:mon'
|
|
||||||
- 'ceph-mon:osd'
|
|
||||||
|
|
||||||
- - 'cinder:storage-backend'
|
|
||||||
- 'cinder-ceph:storage-backend'
|
|
||||||
|
|
||||||
- - 'cinder:backup-backend'
|
|
||||||
- 'cinder-backup:backup-backend'
|
|
||||||
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'keystone-mysql-router:shared-db'
|
|
||||||
- - 'keystone-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'cinder:shared-db'
|
|
||||||
- 'cinder-mysql-router:shared-db'
|
|
||||||
- - 'cinder-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'cinder:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'cinder:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'glance:image-service'
|
|
||||||
- 'nova-compute:image-service'
|
|
||||||
|
|
||||||
- - 'glance:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'glance:shared-db'
|
|
||||||
- 'glance-mysql-router:shared-db'
|
|
||||||
- - 'glance-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'nova-compute:ceph-access'
|
|
||||||
- 'cinder-ceph:ceph-access'
|
|
||||||
|
|
||||||
- - 'nova-compute:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
|
@ -1,164 +0,0 @@
|
||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin distro
|
|
||||||
|
|
||||||
series: hirsute
|
|
||||||
|
|
||||||
comment:
|
|
||||||
- 'machines section to decide order of deployment. database sooner = faster'
|
|
||||||
machines:
|
|
||||||
'0':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'1':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'2':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'3':
|
|
||||||
'4':
|
|
||||||
'5':
|
|
||||||
'6':
|
|
||||||
'7':
|
|
||||||
'8':
|
|
||||||
'9':
|
|
||||||
'10':
|
|
||||||
'11':
|
|
||||||
'12':
|
|
||||||
'13':
|
|
||||||
|
|
||||||
applications:
|
|
||||||
|
|
||||||
keystone-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
cinder-mysql-router:
|
|
||||||
charm: cs:~openstack-charmers/mysql-router
|
|
||||||
glance-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'
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
|
|
||||||
ceph-mon:
|
|
||||||
charm: cs:~openstack-charmers/ceph-mon
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
monitor-count: '3'
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
- '6'
|
|
||||||
- '7'
|
|
||||||
|
|
||||||
ceph-osd:
|
|
||||||
charm: cs:~openstack-charmers/ceph-osd
|
|
||||||
num_units: 3
|
|
||||||
storage:
|
|
||||||
osd-devices: 'cinder,10G'
|
|
||||||
options:
|
|
||||||
osd-devices: '/dev/test-non-existent'
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '8'
|
|
||||||
- '9'
|
|
||||||
- '10'
|
|
||||||
|
|
||||||
cinder:
|
|
||||||
charm: cs:~openstack-charmers/cinder
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
block-device: 'None'
|
|
||||||
glance-api-version: '2'
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '11'
|
|
||||||
|
|
||||||
cinder-backup:
|
|
||||||
charm: ../../../cinder-backup
|
|
||||||
options:
|
|
||||||
ceph-osd-replication-count: 3
|
|
||||||
|
|
||||||
cinder-ceph:
|
|
||||||
charm: cs:~openstack-charmers/cinder-ceph
|
|
||||||
options:
|
|
||||||
ceph-osd-replication-count: 3
|
|
||||||
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '12'
|
|
||||||
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '13'
|
|
||||||
|
|
||||||
relations:
|
|
||||||
|
|
||||||
- - 'cinder-backup:ceph'
|
|
||||||
- 'ceph-mon:client'
|
|
||||||
|
|
||||||
- - 'cinder-ceph:ceph'
|
|
||||||
- 'ceph-mon:client'
|
|
||||||
|
|
||||||
- - 'ceph-osd:mon'
|
|
||||||
- 'ceph-mon:osd'
|
|
||||||
|
|
||||||
- - 'cinder:storage-backend'
|
|
||||||
- 'cinder-ceph:storage-backend'
|
|
||||||
|
|
||||||
- - 'cinder:backup-backend'
|
|
||||||
- 'cinder-backup:backup-backend'
|
|
||||||
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'keystone-mysql-router:shared-db'
|
|
||||||
- - 'keystone-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'cinder:shared-db'
|
|
||||||
- 'cinder-mysql-router:shared-db'
|
|
||||||
- - 'cinder-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'cinder:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'cinder:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'glance:image-service'
|
|
||||||
- 'nova-compute:image-service'
|
|
||||||
|
|
||||||
- - 'glance:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'glance:shared-db'
|
|
||||||
- 'glance-mysql-router:shared-db'
|
|
||||||
- - 'glance-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'nova-compute:ceph-access'
|
|
||||||
- 'cinder-ceph:ceph-access'
|
|
||||||
|
|
||||||
- - 'nova-compute:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
|
@ -1,83 +0,0 @@
|
||||||
series: trusty
|
|
||||||
relations:
|
|
||||||
- - cinder-backup:ceph
|
|
||||||
- ceph-mon:client
|
|
||||||
- - cinder-ceph:ceph
|
|
||||||
- ceph-mon:client
|
|
||||||
- - ceph-osd:mon
|
|
||||||
- ceph-mon:osd
|
|
||||||
- - cinder:storage-backend
|
|
||||||
- cinder-ceph:storage-backend
|
|
||||||
- - cinder:backup-backend
|
|
||||||
- cinder-backup:backup-backend
|
|
||||||
- - keystone:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - cinder:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - cinder:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - cinder:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - glance:image-service
|
|
||||||
- nova-compute:image-service
|
|
||||||
- - glance:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - glance:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - nova-compute:ceph-access
|
|
||||||
- cinder-ceph:ceph-access
|
|
||||||
- - nova-compute:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
applications:
|
|
||||||
percona-cluster:
|
|
||||||
charm: cs:trusty/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
innodb-buffer-pool-size: 256M
|
|
||||||
max-connections: 1000
|
|
||||||
source: cloud:trusty-mitaka
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:trusty-mitaka
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
ceph-mon:
|
|
||||||
charm: cs:~openstack-charmers/ceph-mon
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
monitor-count: '3'
|
|
||||||
auth-supported: 'none'
|
|
||||||
source: cloud:trusty-mitaka
|
|
||||||
ceph-osd:
|
|
||||||
charm: cs:~openstack-charmers/ceph-osd
|
|
||||||
num_units: 3
|
|
||||||
storage:
|
|
||||||
osd-devices: 'cinder,10G'
|
|
||||||
options:
|
|
||||||
osd-devices: '/dev/test-non-existent'
|
|
||||||
source: cloud:trusty-mitaka
|
|
||||||
cinder:
|
|
||||||
charm: cs:~openstack-charmers/cinder
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
block-device: 'None'
|
|
||||||
glance-api-version: '2'
|
|
||||||
openstack-origin: cloud:trusty-mitaka
|
|
||||||
cinder-backup:
|
|
||||||
charm: ../../../cinder-backup
|
|
||||||
series: trusty
|
|
||||||
options:
|
|
||||||
ceph-osd-replication-count: 3
|
|
||||||
cinder-ceph:
|
|
||||||
charm: cs:~openstack-charmers/cinder-ceph
|
|
||||||
options:
|
|
||||||
ceph-osd-replication-count: 3
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 1
|
|
|
@ -1,77 +0,0 @@
|
||||||
series: xenial
|
|
||||||
relations:
|
|
||||||
- - cinder-backup:ceph
|
|
||||||
- ceph-mon:client
|
|
||||||
- - cinder-ceph:ceph
|
|
||||||
- ceph-mon:client
|
|
||||||
- - ceph-osd:mon
|
|
||||||
- ceph-mon:osd
|
|
||||||
- - cinder:storage-backend
|
|
||||||
- cinder-ceph:storage-backend
|
|
||||||
- - cinder:backup-backend
|
|
||||||
- cinder-backup:backup-backend
|
|
||||||
- - keystone:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - cinder:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - cinder:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - cinder:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - glance:image-service
|
|
||||||
- nova-compute:image-service
|
|
||||||
- - glance:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - glance:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - nova-compute:ceph-access
|
|
||||||
- cinder-ceph:ceph-access
|
|
||||||
- - nova-compute:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
applications:
|
|
||||||
percona-cluster:
|
|
||||||
charm: cs:~openstack-charmers/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
innodb-buffer-pool-size: 256M
|
|
||||||
max-connections: 1000
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers/keystone
|
|
||||||
num_units: 1
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
ceph-mon:
|
|
||||||
charm: cs:~openstack-charmers/ceph-mon
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
monitor-count: '3'
|
|
||||||
auth-supported: 'none'
|
|
||||||
ceph-osd:
|
|
||||||
charm: cs:~openstack-charmers/ceph-osd
|
|
||||||
num_units: 3
|
|
||||||
storage:
|
|
||||||
osd-devices: 'cinder,10G'
|
|
||||||
options:
|
|
||||||
osd-devices: '/dev/test-non-existent'
|
|
||||||
cinder:
|
|
||||||
charm: cs:~openstack-charmers/cinder
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
block-device: 'None'
|
|
||||||
glance-api-version: '2'
|
|
||||||
cinder-backup:
|
|
||||||
charm: ../../../cinder-backup
|
|
||||||
series: xenial
|
|
||||||
options:
|
|
||||||
ceph-osd-replication-count: 3
|
|
||||||
cinder-ceph:
|
|
||||||
charm: cs:~openstack-charmers/cinder-ceph
|
|
||||||
options:
|
|
||||||
ceph-osd-replication-count: 3
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 1
|
|
|
@ -1,83 +0,0 @@
|
||||||
series: xenial
|
|
||||||
relations:
|
|
||||||
- - cinder-backup:ceph
|
|
||||||
- ceph-mon:client
|
|
||||||
- - cinder-ceph:ceph
|
|
||||||
- ceph-mon:client
|
|
||||||
- - ceph-osd:mon
|
|
||||||
- ceph-mon:osd
|
|
||||||
- - cinder:storage-backend
|
|
||||||
- cinder-ceph:storage-backend
|
|
||||||
- - cinder:backup-backend
|
|
||||||
- cinder-backup:backup-backend
|
|
||||||
- - keystone:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - cinder:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - cinder:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - cinder:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - glance:image-service
|
|
||||||
- nova-compute:image-service
|
|
||||||
- - glance:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - glance:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - nova-compute:ceph-access
|
|
||||||
- cinder-ceph:ceph-access
|
|
||||||
- - nova-compute:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
applications:
|
|
||||||
percona-cluster:
|
|
||||||
charm: cs:~openstack-charmers/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
innodb-buffer-pool-size: 256M
|
|
||||||
max-connections: 1000
|
|
||||||
source: cloud:xenial-ocata
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:xenial-ocata
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
ceph-mon:
|
|
||||||
charm: cs:~openstack-charmers/ceph-mon
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
monitor-count: '3'
|
|
||||||
auth-supported: 'none'
|
|
||||||
source: cloud:xenial-ocata
|
|
||||||
ceph-osd:
|
|
||||||
charm: cs:~openstack-charmers/ceph-osd
|
|
||||||
num_units: 3
|
|
||||||
storage:
|
|
||||||
osd-devices: 'cinder,10G'
|
|
||||||
options:
|
|
||||||
osd-devices: '/dev/test-non-existent'
|
|
||||||
source: cloud:xenial-ocata
|
|
||||||
cinder:
|
|
||||||
charm: cs:~openstack-charmers/cinder
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
block-device: 'None'
|
|
||||||
glance-api-version: '2'
|
|
||||||
openstack-origin: cloud:xenial-ocata
|
|
||||||
cinder-backup:
|
|
||||||
charm: ../../../cinder-backup
|
|
||||||
series: xenial
|
|
||||||
options:
|
|
||||||
ceph-osd-replication-count: 3
|
|
||||||
cinder-ceph:
|
|
||||||
charm: cs:~openstack-charmers/cinder-ceph
|
|
||||||
options:
|
|
||||||
ceph-osd-replication-count: 3
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 1
|
|
|
@ -1,83 +0,0 @@
|
||||||
series: xenial
|
|
||||||
relations:
|
|
||||||
- - cinder-backup:ceph
|
|
||||||
- ceph-mon:client
|
|
||||||
- - cinder-ceph:ceph
|
|
||||||
- ceph-mon:client
|
|
||||||
- - ceph-osd:mon
|
|
||||||
- ceph-mon:osd
|
|
||||||
- - cinder:storage-backend
|
|
||||||
- cinder-ceph:storage-backend
|
|
||||||
- - cinder:backup-backend
|
|
||||||
- cinder-backup:backup-backend
|
|
||||||
- - keystone:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - cinder:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - cinder:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - cinder:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - glance:image-service
|
|
||||||
- nova-compute:image-service
|
|
||||||
- - glance:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - glance:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - nova-compute:ceph-access
|
|
||||||
- cinder-ceph:ceph-access
|
|
||||||
- - nova-compute:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
applications:
|
|
||||||
percona-cluster:
|
|
||||||
charm: cs:~openstack-charmers/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
innodb-buffer-pool-size: 256M
|
|
||||||
max-connections: 1000
|
|
||||||
source: cloud:xenial-pike
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:xenial-pike
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
ceph-mon:
|
|
||||||
charm: cs:~openstack-charmers/ceph-mon
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
monitor-count: '3'
|
|
||||||
auth-supported: 'none'
|
|
||||||
source: cloud:xenial-pike
|
|
||||||
ceph-osd:
|
|
||||||
charm: cs:~openstack-charmers/ceph-osd
|
|
||||||
num_units: 3
|
|
||||||
storage:
|
|
||||||
osd-devices: 'cinder,10G'
|
|
||||||
options:
|
|
||||||
osd-devices: '/dev/test-non-existent'
|
|
||||||
source: cloud:xenial-pike
|
|
||||||
cinder:
|
|
||||||
charm: cs:~openstack-charmers/cinder
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
block-device: 'None'
|
|
||||||
glance-api-version: '2'
|
|
||||||
openstack-origin: cloud:xenial-pike
|
|
||||||
cinder-backup:
|
|
||||||
charm: ../../../cinder-backup
|
|
||||||
series: xenial
|
|
||||||
options:
|
|
||||||
ceph-osd-replication-count: 3
|
|
||||||
cinder-ceph:
|
|
||||||
charm: cs:~openstack-charmers/cinder-ceph
|
|
||||||
options:
|
|
||||||
ceph-osd-replication-count: 3
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 1
|
|
|
@ -1,83 +0,0 @@
|
||||||
series: xenial
|
|
||||||
relations:
|
|
||||||
- - cinder-backup:ceph
|
|
||||||
- ceph-mon:client
|
|
||||||
- - cinder-ceph:ceph
|
|
||||||
- ceph-mon:client
|
|
||||||
- - ceph-osd:mon
|
|
||||||
- ceph-mon:osd
|
|
||||||
- - cinder:storage-backend
|
|
||||||
- cinder-ceph:storage-backend
|
|
||||||
- - cinder:backup-backend
|
|
||||||
- cinder-backup:backup-backend
|
|
||||||
- - keystone:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - cinder:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - cinder:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - cinder:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
- - glance:image-service
|
|
||||||
- nova-compute:image-service
|
|
||||||
- - glance:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
- - glance:shared-db
|
|
||||||
- percona-cluster:shared-db
|
|
||||||
- - nova-compute:ceph-access
|
|
||||||
- cinder-ceph:ceph-access
|
|
||||||
- - nova-compute:amqp
|
|
||||||
- rabbitmq-server:amqp
|
|
||||||
applications:
|
|
||||||
percona-cluster:
|
|
||||||
charm: cs:~openstack-charmers/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
innodb-buffer-pool-size: 256M
|
|
||||||
max-connections: 1000
|
|
||||||
source: cloud:xenial-queens
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:xenial-queens
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers/rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
ceph-mon:
|
|
||||||
charm: cs:~openstack-charmers/ceph-mon
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
monitor-count: '3'
|
|
||||||
auth-supported: 'none'
|
|
||||||
source: cloud:xenial-queens
|
|
||||||
ceph-osd:
|
|
||||||
charm: cs:~openstack-charmers/ceph-osd
|
|
||||||
num_units: 3
|
|
||||||
storage:
|
|
||||||
osd-devices: 'cinder,10G'
|
|
||||||
options:
|
|
||||||
osd-devices: '/dev/test-non-existent'
|
|
||||||
source: cloud:xenial-queens
|
|
||||||
cinder:
|
|
||||||
charm: cs:~openstack-charmers/cinder
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
block-device: 'None'
|
|
||||||
glance-api-version: '2'
|
|
||||||
openstack-origin: cloud:xenial-queens
|
|
||||||
cinder-backup:
|
|
||||||
charm: ../../../cinder-backup
|
|
||||||
series: xenial
|
|
||||||
options:
|
|
||||||
ceph-osd-replication-count: 3
|
|
||||||
cinder-ceph:
|
|
||||||
charm: cs:~openstack-charmers/cinder-ceph
|
|
||||||
options:
|
|
||||||
ceph-osd-replication-count: 3
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers/glance
|
|
||||||
num_units: 1
|
|
||||||
nova-compute:
|
|
||||||
charm: cs:~openstack-charmers/nova-compute
|
|
||||||
num_units: 1
|
|
|
@ -1,30 +1,17 @@
|
||||||
charm_name: cinder-backup
|
charm_name: cinder-backup
|
||||||
|
|
||||||
smoke_bundles:
|
smoke_bundles:
|
||||||
- bionic-train
|
- bionic-ussuri
|
||||||
|
|
||||||
gate_bundles:
|
gate_bundles:
|
||||||
- xenial-mitaka
|
|
||||||
- bionic-queens
|
|
||||||
- bionic-stein
|
|
||||||
- bionic-train
|
- bionic-train
|
||||||
- bionic-ussuri
|
- bionic-ussuri
|
||||||
- focal-victoria
|
|
||||||
- focal-wallaby
|
|
||||||
- groovy-victoria
|
|
||||||
|
|
||||||
dev_bundles:
|
dev_bundles:
|
||||||
- trusty-mitaka # fails often because of lp:1877076
|
|
||||||
- xenial-ocata
|
|
||||||
- xenial-pike
|
|
||||||
- xenial-queens
|
|
||||||
- bionic-rocky
|
|
||||||
- focal-ussuri # disabled because of lp:1891626
|
- focal-ussuri # disabled because of lp:1891626
|
||||||
- hirsute-wallaby
|
|
||||||
|
|
||||||
tests:
|
tests:
|
||||||
- zaza.openstack.charm_tests.cinder_backup.tests.CinderBackupTest
|
- zaza.openstack.charm_tests.cinder_backup.tests.CinderBackupTest
|
||||||
|
|
||||||
tests_options:
|
tests_options:
|
||||||
force_deploy:
|
force_deploy: []
|
||||||
- hirsute-wallaby
|
|
||||||
|
|
30
tox.ini
30
tox.ini
|
@ -37,12 +37,22 @@ setenv = VIRTUAL_ENV={envdir}
|
||||||
install_command =
|
install_command =
|
||||||
{toxinidir}/pip.sh install {opts} {packages}
|
{toxinidir}/pip.sh install {opts} {packages}
|
||||||
commands = stestr run --slowest {posargs}
|
commands = stestr run --slowest {posargs}
|
||||||
allowlist_externals = juju
|
allowlist_externals =
|
||||||
|
charmcraft
|
||||||
|
rename.sh
|
||||||
passenv = HOME TERM CS_* OS_* TEST_*
|
passenv = HOME TERM CS_* OS_* TEST_*
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
|
|
||||||
[testenv:py35]
|
[testenv:build]
|
||||||
basepython = python3.5
|
basepython = python3
|
||||||
|
deps = -r{toxinidir}/build-requirements.txt
|
||||||
|
commands =
|
||||||
|
charmcraft clean
|
||||||
|
charmcraft -v build
|
||||||
|
{toxinidir}/rename.sh
|
||||||
|
|
||||||
|
[testenv:py3]
|
||||||
|
basepython = python3
|
||||||
deps = -r{toxinidir}/requirements.txt
|
deps = -r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
|
|
||||||
|
@ -50,21 +60,31 @@ deps = -r{toxinidir}/requirements.txt
|
||||||
basepython = python3.6
|
basepython = python3.6
|
||||||
deps = -r{toxinidir}/requirements.txt
|
deps = -r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
|
commands = stestr run --slowest {posargs}
|
||||||
|
|
||||||
[testenv:py37]
|
[testenv:py37]
|
||||||
basepython = python3.7
|
basepython = python3.7
|
||||||
deps = -r{toxinidir}/requirements.txt
|
deps = -r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
|
commands = stestr run --slowest {posargs}
|
||||||
|
|
||||||
[testenv:py38]
|
[testenv:py38]
|
||||||
basepython = python3.8
|
basepython = python3.8
|
||||||
deps = -r{toxinidir}/requirements.txt
|
deps = -r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
|
commands = stestr run --slowest {posargs}
|
||||||
|
|
||||||
[testenv:py3]
|
[testenv:py39]
|
||||||
basepython = python3
|
basepython = python3.9
|
||||||
deps = -r{toxinidir}/requirements.txt
|
deps = -r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
|
commands = stestr run --slowest {posargs}
|
||||||
|
|
||||||
|
[testenv:py310]
|
||||||
|
basepython = python3.10
|
||||||
|
deps = -r{toxinidir}/requirements.txt
|
||||||
|
-r{toxinidir}/test-requirements.txt
|
||||||
|
commands = stestr run --slowest {posargs}
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
|
|
Loading…
Reference in New Issue