Migrate charm charmhub for stable/wallaby
- start from stable/wallaby branch - Do charmcraft, osci, zuul changes - Modify libs to point to stable/wallaby for: - charmhelpers - charms.openstack (as needed) - zaza & zaza.openstack.tests - Remove unsupported test bundles - migration bundles to charmhub.io (ch: prefix + channels) - Build on 20.04 amd64 - Run on 20.04 amd64, s390x, ppc64el, arm64 Change-Id: I45e8394ffbad047dc30b76e148ad638cdf9f6fb1
This commit is contained in:
Alex Kavanagh
Liam Young
parent
ae2f473ce2
commit
3a51c9b3f5
|
|
@ -7,3 +7,4 @@ bin
|
|||
*.pyc
|
||||
func-results.json
|
||||
.stestr
|
||||
*.charm
|
||||
|
|
|
|||
|
|
@ -3,4 +3,4 @@ host=review.opendev.org
|
|||
port=29418
|
||||
project=openstack/charm-cinder-backup.git
|
||||
|
||||
defaultbranch=stable/21.10
|
||||
defaultbranch=stable/wallaby
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
- project:
|
||||
templates:
|
||||
- python35-charm-jobs
|
||||
- openstack-python3-ussuri-jobs
|
||||
- openstack-python3-wallaby-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/wallaby
|
||||
destination: hooks/charmhelpers
|
||||
include:
|
||||
- core
|
||||
|
|
|
|||
|
|
@ -0,0 +1,30 @@
|
|||
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: "20.04"
|
||||
architectures:
|
||||
- amd64
|
||||
run-on:
|
||||
- name: ubuntu
|
||||
channel: "20.04"
|
||||
architectures: [amd64, s390x, ppc64el, arm64]
|
||||
|
|
@ -8,12 +8,7 @@ description: |
|
|||
tags:
|
||||
- miscellaneous
|
||||
series:
|
||||
- xenial
|
||||
- bionic
|
||||
- focal
|
||||
- groovy
|
||||
- hirsute
|
||||
- impish
|
||||
subordinate: true
|
||||
provides:
|
||||
backup-backend:
|
||||
|
|
|
|||
22
osci.yaml
22
osci.yaml
|
|
@ -1,17 +1,9 @@
|
|||
- project:
|
||||
templates:
|
||||
- charm-unit-jobs
|
||||
# Revert this to the project-template when trusty is actually
|
||||
# removed from the charm-functional-jobs template
|
||||
# - charm-functional-jobs
|
||||
check:
|
||||
jobs:
|
||||
- xenial-mitaka
|
||||
- bionic-queens
|
||||
- bionic-stein
|
||||
- bionic-train
|
||||
- bionic-ussuri
|
||||
- focal-victoria
|
||||
- focal-wallaby
|
||||
- groovy-victoria
|
||||
#- hirsute-wallaby
|
||||
- charm-unit-jobs-py38
|
||||
- charm-victoria-functional-jobs
|
||||
- charm-wallaby-functional-jobs
|
||||
vars:
|
||||
needs_charm_build: true
|
||||
charm_build_name: cinder-backup
|
||||
build_type: charmcraft
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -0,0 +1 @@
|
|||
Dummy file to ensure build picks up templates dir
|
||||
|
|
@ -7,6 +7,7 @@
|
|||
# requirements. They are intertwined. Also, Zaza itself should specify
|
||||
# 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.
|
||||
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
|
||||
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-openstack-tests.git@stable/21.10#egg=zaza.openstack
|
||||
git+https://github.com/openstack-charmers/zaza.git@stable/wallaby#egg=zaza
|
||||
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/wallaby#egg=zaza.openstack
|
||||
|
||||
# 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'
|
||||
|
||||
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,82 +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-train
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-train
|
||||
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'
|
||||
source: cloud:bionic-train
|
||||
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-train
|
||||
cinder:
|
||||
charm: cs:~openstack-charmers/cinder
|
||||
num_units: 1
|
||||
options:
|
||||
block-device: 'None'
|
||||
glance-api-version: '2'
|
||||
openstack-origin: cloud:bionic-train
|
||||
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,82 +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-train
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-train
|
||||
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'
|
||||
source: cloud:bionic-train
|
||||
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-train
|
||||
cinder:
|
||||
charm: cs:~openstack-charmers/cinder
|
||||
num_units: 1
|
||||
options:
|
||||
block-device: 'None'
|
||||
glance-api-version: '2'
|
||||
openstack-origin: cloud:bionic-train
|
||||
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,164 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
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,3 +1,5 @@
|
|||
local_overlay_enabled: False
|
||||
|
||||
variables:
|
||||
openstack-origin: &openstack-origin cloud:focal-victoria
|
||||
|
||||
|
|
@ -27,14 +29,17 @@ machines:
|
|||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
charm: ch:mysql-router
|
||||
channel: 8.0/edge
|
||||
cinder-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
charm: ch:mysql-router
|
||||
channel: 8.0/edge
|
||||
glance-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
charm: ch:mysql-router
|
||||
channel: 8.0/edge
|
||||
|
||||
mysql-innodb-cluster:
|
||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
||||
charm: ch:mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
|
|
@ -42,23 +47,26 @@ applications:
|
|||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
channel: 8.0/edge
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
charm: ch:keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
channel: wallaby/edge
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
to:
|
||||
- '4'
|
||||
channel: 3.8/edge
|
||||
|
||||
ceph-mon:
|
||||
charm: cs:~openstack-charmers/ceph-mon
|
||||
charm: ch:ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
monitor-count: '3'
|
||||
|
|
@ -67,9 +75,10 @@ applications:
|
|||
- '5'
|
||||
- '6'
|
||||
- '7'
|
||||
channel: pacific/edge
|
||||
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers/ceph-osd
|
||||
charm: ch:ceph-osd
|
||||
num_units: 3
|
||||
storage:
|
||||
osd-devices: 'cinder,10G'
|
||||
|
|
@ -80,9 +89,10 @@ applications:
|
|||
- '8'
|
||||
- '9'
|
||||
- '10'
|
||||
channel: pacific/edge
|
||||
|
||||
cinder:
|
||||
charm: cs:~openstack-charmers/cinder
|
||||
charm: ch:cinder
|
||||
num_units: 1
|
||||
options:
|
||||
block-device: 'None'
|
||||
|
|
@ -90,28 +100,32 @@ applications:
|
|||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '11'
|
||||
channel: wallaby/edge
|
||||
|
||||
cinder-backup:
|
||||
charm: ../../../cinder-backup
|
||||
charm: ../../cinder-backup.charm
|
||||
options:
|
||||
ceph-osd-replication-count: 3
|
||||
|
||||
cinder-ceph:
|
||||
charm: cs:~openstack-charmers/cinder-ceph
|
||||
charm: ch:cinder-ceph
|
||||
options:
|
||||
ceph-osd-replication-count: 3
|
||||
channel: wallaby/edge
|
||||
|
||||
glance:
|
||||
charm: cs:~openstack-charmers/glance
|
||||
charm: ch:glance
|
||||
num_units: 1
|
||||
to:
|
||||
- '12'
|
||||
channel: wallaby/edge
|
||||
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers/nova-compute
|
||||
charm: ch:nova-compute
|
||||
num_units: 1
|
||||
to:
|
||||
- '13'
|
||||
channel: wallaby/edge
|
||||
|
||||
relations:
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
local_overlay_enabled: False
|
||||
|
||||
variables:
|
||||
openstack-origin: &openstack-origin cloud:focal-wallaby
|
||||
|
||||
|
|
@ -27,14 +29,17 @@ machines:
|
|||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
charm: ch:mysql-router
|
||||
channel: 8.0/edge
|
||||
cinder-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
charm: ch:mysql-router
|
||||
channel: 8.0/edge
|
||||
glance-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
charm: ch:mysql-router
|
||||
channel: 8.0/edge
|
||||
|
||||
mysql-innodb-cluster:
|
||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
||||
charm: ch:mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
|
|
@ -42,23 +47,26 @@ applications:
|
|||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
channel: 8.0/edge
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
charm: ch:keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
channel: wallaby/edge
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
to:
|
||||
- '4'
|
||||
channel: 3.8/edge
|
||||
|
||||
ceph-mon:
|
||||
charm: cs:~openstack-charmers/ceph-mon
|
||||
charm: ch:ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
monitor-count: '3'
|
||||
|
|
@ -67,9 +75,10 @@ applications:
|
|||
- '5'
|
||||
- '6'
|
||||
- '7'
|
||||
channel: pacific/edge
|
||||
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers/ceph-osd
|
||||
charm: ch:ceph-osd
|
||||
num_units: 3
|
||||
storage:
|
||||
osd-devices: 'cinder,10G'
|
||||
|
|
@ -80,9 +89,10 @@ applications:
|
|||
- '8'
|
||||
- '9'
|
||||
- '10'
|
||||
channel: pacific/edge
|
||||
|
||||
cinder:
|
||||
charm: cs:~openstack-charmers/cinder
|
||||
charm: ch:cinder
|
||||
num_units: 1
|
||||
options:
|
||||
block-device: 'None'
|
||||
|
|
@ -90,28 +100,32 @@ applications:
|
|||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '11'
|
||||
channel: wallaby/edge
|
||||
|
||||
cinder-backup:
|
||||
charm: ../../../cinder-backup
|
||||
charm: ../../cinder-backup.charm
|
||||
options:
|
||||
ceph-osd-replication-count: 3
|
||||
|
||||
cinder-ceph:
|
||||
charm: cs:~openstack-charmers/cinder-ceph
|
||||
charm: ch:cinder-ceph
|
||||
options:
|
||||
ceph-osd-replication-count: 3
|
||||
channel: wallaby/edge
|
||||
|
||||
glance:
|
||||
charm: cs:~openstack-charmers/glance
|
||||
charm: ch:glance
|
||||
num_units: 1
|
||||
to:
|
||||
- '12'
|
||||
channel: wallaby/edge
|
||||
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers/nova-compute
|
||||
charm: ch:nova-compute
|
||||
num_units: 1
|
||||
to:
|
||||
- '13'
|
||||
channel: wallaby/edge
|
||||
|
||||
relations:
|
||||
|
||||
|
|
|
|||
|
|
@ -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,15 @@
|
|||
charm_name: cinder-backup
|
||||
|
||||
smoke_bundles:
|
||||
- bionic-train
|
||||
smoke_bundles: []
|
||||
|
||||
gate_bundles:
|
||||
- xenial-mitaka
|
||||
- bionic-queens
|
||||
- bionic-stein
|
||||
- bionic-train
|
||||
- bionic-ussuri
|
||||
- focal-victoria
|
||||
- focal-wallaby
|
||||
- groovy-victoria
|
||||
|
||||
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
|
||||
- hirsute-wallaby
|
||||
dev_bundles: []
|
||||
|
||||
tests:
|
||||
- zaza.openstack.charm_tests.cinder_backup.tests.CinderBackupTest
|
||||
|
||||
tests_options:
|
||||
force_deploy:
|
||||
- hirsute-wallaby
|
||||
force_deploy: []
|
||||
|
|
|
|||
34
tox.ini
34
tox.ini
|
|
@ -37,12 +37,22 @@ setenv = VIRTUAL_ENV={envdir}
|
|||
install_command =
|
||||
{toxinidir}/pip.sh install {opts} {packages}
|
||||
commands = stestr run --slowest {posargs}
|
||||
allowlist_externals = juju
|
||||
allowlist_externals =
|
||||
charmcraft
|
||||
rename.sh
|
||||
passenv = HOME TERM CS_* OS_* TEST_*
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
|
||||
[testenv:py35]
|
||||
basepython = python3.5
|
||||
[testenv:build]
|
||||
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
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
|
||||
|
|
@ -50,21 +60,25 @@ deps = -r{toxinidir}/requirements.txt
|
|||
basepython = python3.6
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
|
||||
[testenv:py37]
|
||||
basepython = python3.7
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
commands = stestr run --slowest {posargs}
|
||||
|
||||
[testenv:py38]
|
||||
basepython = python3.8
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
commands = stestr run --slowest {posargs}
|
||||
|
||||
[testenv:py3]
|
||||
basepython = python3
|
||||
[testenv:py39]
|
||||
basepython = python3.9
|
||||
deps = -r{toxinidir}/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]
|
||||
basepython = python3
|
||||
|
|
|
|||
Loading…
Reference in New Issue