Charmhub migration for stable/train (bionic-only)

This is the main patch for the migration of the stable/21.10
charm to charmhub for the stable/train branch (train track on
charmhub).  This patch initially supports bionic from queens
to train, and does not support ussuri.  It supports upgrades
from bionic-queens to bionic-train (with each intermediate
step needed).  Crucially it does NOT set a default
openstack-origin, which means installing train/stable
without specifying the openstack-origin will result in a
bionic-queens installation.  This is intentional as the branch
covers queens to train.

Change-Id: If962a952381db9a3f7a978a9b3cf21e8b569a2ba
This commit is contained in:
Alex Kavanagh 2022-06-22 17:27:29 +01:00
parent 91d83d8b06
commit ed0b684656
26 changed files with 159 additions and 1233 deletions

1
.gitignore vendored
View File

@ -15,3 +15,4 @@ repo-info
results*.txt
func-results.json
__pycache__
*.charm

View File

@ -3,4 +3,4 @@ host=review.opendev.org
port=29418
project=openstack/charm-glance-simplestreams-sync.git
defaultbranch=stable/21.10
defaultbranch=stable/train

View File

@ -1,5 +1,5 @@
- project:
templates:
- python35-charm-jobs
- openstack-python3-ussuri-jobs
# note that this requires tox-py36 and tox-py37 targets
- openstack-python3-train-jobs
- openstack-cover-jobs

7
build-requirements.txt Normal file
View File

@ -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.

View File

@ -1,4 +1,4 @@
repo: https://github.com/juju/charm-helpers@stable/21.10
repo: https://github.com/juju/charm-helpers@stable/train
destination: charmhelpers
include:
- core

31
charmcraft.yaml Normal file
View File

@ -0,0 +1,31 @@
type: charm
parts:
charm:
plugin: dump
source: .
prime:
- actions/*
- charmhelpers/*
- files/*
- hooks/*
- lib/*
- templates/*
- actions.yaml
- config.yaml
- copyright
- 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]

View File

@ -8,12 +8,7 @@ tags:
- misc
- openstack
series:
- xenial
- bionic
- focal
- groovy
- hirsute
- impish
subordinate: false
provides:
simplestreams-image-service:

View File

@ -1,21 +1,11 @@
- project:
templates:
- charm-unit-jobs
check:
jobs:
- xenial-mitaka
- bionic-queens
- bionic-stein
- bionic-train
- bionic-ussuri
- focal-ussuri
- focal-victoria
- focal-wallaby
- focal-xena:
voting: false
# hirsuite-wallaby disabled due to:
# https://bugs.launchpad.net/charm-ceph-osd/+bug/1929732
- hirsute-wallaby:
voting: false
- impish-xena:
voting: false
- charm-unit-jobs-py36
- charm-queens-functional-jobs
- charm-rocky-functional-jobs
- charm-stein-functional-jobs
- charm-train-functional-jobs
vars:
needs_charm_build: true
charm_build_name: glance-simplestreams-sync
build_type: charmcraft

13
rename.sh Executable file
View File

@ -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

View File

@ -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/train#egg=zaza
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/train#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'
tempest<24.0.0;python_version<'3.6'
croniter # needed for charm-rabbitmq-server unit tests

View File

@ -1,3 +1,5 @@
local_overlay_enabled: False
series: bionic
comment:
@ -37,37 +39,42 @@ relations:
applications:
mysql:
charm: cs:~openstack-charmers/percona-cluster
charm: ch:percona-cluster
num_units: 1
to:
- '0'
channel: 5.7/edge
vault:
charm: cs:~openstack-charmers/vault
charm: ch:vault
num_units: 1
to:
- '1'
channel: 1.6/edge
keystone:
charm: cs:~openstack-charmers/keystone
charm: ch:keystone
num_units: 1
to:
- '2'
channel: train/edge
glance:
charm: cs:~openstack-charmers/glance
charm: ch:glance
num_units: 1
to:
- '3'
channel: train/edge
glance-simplestreams-sync:
charm: ../../glance-simplestreams-sync
charm: ../../glance-simplestreams-sync.charm
num_units: 1
to:
- '4'
ceph-radosgw:
charm: cs:~openstack-charmers/ceph-radosgw
charm: ch:ceph-radosgw
num_units: 1
to:
- '5'
channel: nautilus/edge
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
charm: ch:ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -75,10 +82,12 @@ applications:
- '6'
- '7'
- '8'
channel: nautilus/edge
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
charm: ch:ceph-mon
num_units: 3
to:
- '9'
- '10'
- '11'
channel: nautilus/edge

View File

@ -1,3 +1,5 @@
local_overlay_enabled: False
options:
source: &source cloud:bionic-rocky
@ -40,44 +42,49 @@ relations:
applications:
mysql:
charm: cs:~openstack-charmers/percona-cluster
charm: ch:percona-cluster
num_units: 1
to:
- '0'
channel: 5.7/edge
vault:
charm: cs:~openstack-charmers/vault
charm: ch:vault
num_units: 1
to:
- '1'
channel: 1.6/edge
keystone:
series: bionic
charm: cs:~openstack-charmers/keystone
charm: ch:keystone
num_units: 1
options:
openstack-origin: *source
to:
- '2'
channel: train/edge
glance:
charm: cs:~openstack-charmers/glance
charm: ch:glance
num_units: 1
options:
openstack-origin: *source
to:
- '3'
channel: train/edge
glance-simplestreams-sync:
charm: ../../glance-simplestreams-sync
charm: ../../glance-simplestreams-sync.charm
num_units: 1
to:
- '4'
ceph-radosgw:
charm: cs:~openstack-charmers/ceph-radosgw
charm: ch:ceph-radosgw
num_units: 1
options:
source: *source
to:
- '5'
channel: nautilus/edge
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
charm: ch:ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -87,8 +94,9 @@ applications:
- '6'
- '7'
- '8'
channel: nautilus/edge
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
charm: ch:ceph-mon
num_units: 3
options:
source: *source
@ -96,3 +104,4 @@ applications:
- '9'
- '10'
- '11'
channel: nautilus/edge

View File

@ -1,3 +1,5 @@
local_overlay_enabled: False
options:
source: &source cloud:bionic-stein
@ -40,44 +42,49 @@ relations:
applications:
mysql:
charm: cs:~openstack-charmers/percona-cluster
charm: ch:percona-cluster
num_units: 1
to:
- '0'
channel: 5.7/edge
vault:
charm: cs:~openstack-charmers/vault
charm: ch:vault
num_units: 1
to:
- '1'
channel: 1.6/edge
keystone:
series: bionic
charm: cs:~openstack-charmers/keystone
charm: ch:keystone
num_units: 1
options:
openstack-origin: *source
to:
- '2'
channel: train/edge
glance:
charm: cs:~openstack-charmers/glance
charm: ch:glance
num_units: 1
options:
openstack-origin: *source
to:
- '3'
channel: train/edge
glance-simplestreams-sync:
charm: ../../glance-simplestreams-sync
charm: ../../glance-simplestreams-sync.charm
num_units: 1
to:
- '4'
ceph-radosgw:
charm: cs:~openstack-charmers/ceph-radosgw
charm: ch:ceph-radosgw
num_units: 1
options:
source: *source
to:
- '5'
channel: nautilus/edge
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
charm: ch:ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -87,8 +94,9 @@ applications:
- '6'
- '7'
- '8'
channel: nautilus/edge
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
charm: ch:ceph-mon
num_units: 3
options:
source: *source
@ -96,3 +104,4 @@ applications:
- '9'
- '10'
- '11'
channel: nautilus/edge

View File

@ -1,3 +1,5 @@
local_overlay_enabled: False
options:
source: &source cloud:bionic-train
@ -40,44 +42,49 @@ relations:
applications:
mysql:
charm: cs:~openstack-charmers/percona-cluster
charm: ch:percona-cluster
num_units: 1
to:
- '0'
channel: 5.7/edge
vault:
charm: cs:~openstack-charmers/vault
charm: ch:vault
num_units: 1
to:
- '1'
channel: 1.6/edge
keystone:
series: bionic
charm: cs:~openstack-charmers/keystone
charm: ch:keystone
num_units: 1
options:
openstack-origin: *source
to:
- '2'
channel: train/edge
glance:
charm: cs:~openstack-charmers/glance
charm: ch:glance
num_units: 1
options:
openstack-origin: *source
to:
- '3'
channel: train/edge
glance-simplestreams-sync:
charm: ../../glance-simplestreams-sync
charm: ../../glance-simplestreams-sync.charm
num_units: 1
to:
- '4'
ceph-radosgw:
charm: cs:~openstack-charmers/ceph-radosgw
charm: ch:ceph-radosgw
num_units: 1
options:
source: *source
to:
- '5'
channel: nautilus/edge
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
charm: ch:ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -87,8 +94,9 @@ applications:
- '6'
- '7'
- '8'
channel: nautilus/edge
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
charm: ch:ceph-mon
num_units: 3
options:
source: *source
@ -96,3 +104,4 @@ applications:
- '9'
- '10'
- '11'
channel: nautilus/edge

View File

@ -1,98 +0,0 @@
options:
source: &source cloud:bionic-ussuri
series: bionic
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
'1':
'2':
'3':
'4':
'5':
'6':
constraints: "mem=2048"
'7':
constraints: "mem=2048"
'8':
constraints: "mem=2048"
'9':
'10':
'11':
relations:
- ['vault:shared-db', 'mysql:shared-db']
- ['keystone:shared-db', 'mysql:shared-db']
- ['glance:shared-db', 'mysql:shared-db']
- ['glance:ceph', 'ceph-mon:client']
- ['keystone:certificates', 'vault:certificates']
- ['glance:certificates', 'vault:certificates']
- ['glance-simplestreams-sync:certificates', 'vault:certificates']
- ['glance:identity-service', 'keystone:identity-service']
- ['glance-simplestreams-sync:identity-service', 'keystone:identity-service']
- ['ceph-osd:mon', 'ceph-mon:osd']
- ['ceph-radosgw:mon', 'ceph-mon:radosgw']
- ['ceph-radosgw:identity-service', 'keystone:identity-service']
- ['ceph-radosgw:certificates', 'vault:certificates']
applications:
mysql:
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
to:
- '0'
vault:
charm: cs:~openstack-charmers/vault
num_units: 1
to:
- '1'
keystone:
series: bionic
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '2'
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
to:
- '3'
glance-simplestreams-sync:
charm: ../../glance-simplestreams-sync
num_units: 1
to:
- '4'
ceph-radosgw:
charm: cs:~openstack-charmers/ceph-radosgw
num_units: 1
options:
source: *source
to:
- '5'
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *source
to:
- '6'
- '7'
- '8'
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *source
to:
- '9'
- '10'
- '11'

View File

@ -1,122 +0,0 @@
variables:
source: &source distro
series: focal
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
'1':
'2':
'3':
'4':
'5':
'6':
'7':
'8':
constraints: "mem=2048"
'9':
constraints: "mem=2048"
'10':
constraints: "mem=2048"
'11':
'12':
'13':
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
vault-mysql-router:
charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *source
to:
- '0'
- '1'
- '2'
vault:
charm: cs:~openstack-charmers/vault
num_units: 1
to:
- '3'
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '4'
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
to:
- '5'
glance-simplestreams-sync:
charm: ../../glance-simplestreams-sync
num_units: 1
to:
- '6'
ceph-radosgw:
charm: cs:~openstack-charmers/ceph-radosgw
num_units: 1
options:
source: *source
to:
- '7'
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *source
to:
- '8'
- '9'
- '10'
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *source
to:
- '11'
- '12'
- '13'
relations:
- ['keystone:certificates', 'vault:certificates']
- ['glance:certificates', 'vault:certificates']
- ['glance-simplestreams-sync:certificates', 'vault:certificates']
- ['glance:identity-service', 'keystone:identity-service']
- ['glance-simplestreams-sync:identity-service', 'keystone:identity-service']
- ['keystone:shared-db','keystone-mysql-router:shared-db']
- ['glance:shared-db','glance-mysql-router:shared-db']
- ['glance:ceph', 'ceph-mon:client']
- ['vault:shared-db','vault-mysql-router:shared-db']
- ['keystone-mysql-router:db-router','mysql-innodb-cluster:db-router']
- ['glance-mysql-router:db-router','mysql-innodb-cluster:db-router']
- ['vault-mysql-router:db-router','mysql-innodb-cluster:db-router']
- ['ceph-osd:mon', 'ceph-mon:osd']
- ['ceph-radosgw:mon', 'ceph-mon:radosgw']
- ['ceph-radosgw:identity-service', 'keystone:identity-service']
- ['ceph-radosgw:certificates', 'vault:certificates']

View File

@ -1,122 +0,0 @@
variables:
source: &source cloud:focal-victoria
series: focal
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
'1':
'2':
'3':
'4':
'5':
'6':
'7':
'8':
constraints: "mem=2048"
'9':
constraints: "mem=2048"
'10':
constraints: "mem=2048"
'11':
'12':
'13':
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
vault-mysql-router:
charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *source
to:
- '0'
- '1'
- '2'
vault:
charm: cs:~openstack-charmers/vault
num_units: 1
to:
- '3'
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '4'
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
to:
- '5'
glance-simplestreams-sync:
charm: ../../glance-simplestreams-sync
num_units: 1
to:
- '6'
ceph-radosgw:
charm: cs:~openstack-charmers/ceph-radosgw
num_units: 1
options:
source: *source
to:
- '7'
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *source
to:
- '8'
- '9'
- '10'
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *source
to:
- '11'
- '12'
- '13'
relations:
- ['keystone:certificates', 'vault:certificates']
- ['glance:certificates', 'vault:certificates']
- ['glance-simplestreams-sync:certificates', 'vault:certificates']
- ['glance:identity-service', 'keystone:identity-service']
- ['glance-simplestreams-sync:identity-service', 'keystone:identity-service']
- ['keystone:shared-db','keystone-mysql-router:shared-db']
- ['glance:shared-db','glance-mysql-router:shared-db']
- ['glance:ceph', 'ceph-mon:client']
- ['vault:shared-db','vault-mysql-router:shared-db']
- ['keystone-mysql-router:db-router','mysql-innodb-cluster:db-router']
- ['glance-mysql-router:db-router','mysql-innodb-cluster:db-router']
- ['vault-mysql-router:db-router','mysql-innodb-cluster:db-router']
- ['ceph-osd:mon', 'ceph-mon:osd']
- ['ceph-radosgw:mon', 'ceph-mon:radosgw']
- ['ceph-radosgw:identity-service', 'keystone:identity-service']
- ['ceph-radosgw:certificates', 'vault:certificates']

View File

@ -1,122 +0,0 @@
variables:
source: &source cloud:focal-wallaby
series: focal
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
'1':
'2':
'3':
'4':
'5':
'6':
'7':
'8':
constraints: "mem=2048"
'9':
constraints: "mem=2048"
'10':
constraints: "mem=2048"
'11':
'12':
'13':
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
vault-mysql-router:
charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *source
to:
- '0'
- '1'
- '2'
vault:
charm: cs:~openstack-charmers/vault
num_units: 1
to:
- '3'
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '4'
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
to:
- '5'
glance-simplestreams-sync:
charm: ../../glance-simplestreams-sync
num_units: 1
to:
- '6'
ceph-radosgw:
charm: cs:~openstack-charmers/ceph-radosgw
num_units: 1
options:
source: *source
to:
- '7'
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *source
to:
- '8'
- '9'
- '10'
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *source
to:
- '11'
- '12'
- '13'
relations:
- ['keystone:certificates', 'vault:certificates']
- ['glance:certificates', 'vault:certificates']
- ['glance-simplestreams-sync:certificates', 'vault:certificates']
- ['glance:identity-service', 'keystone:identity-service']
- ['glance-simplestreams-sync:identity-service', 'keystone:identity-service']
- ['keystone:shared-db','keystone-mysql-router:shared-db']
- ['glance:shared-db','glance-mysql-router:shared-db']
- ['glance:ceph', 'ceph-mon:client']
- ['vault:shared-db','vault-mysql-router:shared-db']
- ['keystone-mysql-router:db-router','mysql-innodb-cluster:db-router']
- ['glance-mysql-router:db-router','mysql-innodb-cluster:db-router']
- ['vault-mysql-router:db-router','mysql-innodb-cluster:db-router']
- ['ceph-osd:mon', 'ceph-mon:osd']
- ['ceph-radosgw:mon', 'ceph-mon:radosgw']
- ['ceph-radosgw:identity-service', 'keystone:identity-service']
- ['ceph-radosgw:certificates', 'vault:certificates']

View File

@ -1,122 +0,0 @@
variables:
source: &source cloud:focal-xena
series: focal
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
'1':
'2':
'3':
'4':
'5':
'6':
'7':
'8':
constraints: "mem=2048"
'9':
constraints: "mem=2048"
'10':
constraints: "mem=2048"
'11':
'12':
'13':
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
vault-mysql-router:
charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *source
to:
- '0'
- '1'
- '2'
vault:
charm: cs:~openstack-charmers/vault
num_units: 1
to:
- '3'
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '4'
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
to:
- '5'
glance-simplestreams-sync:
charm: ../../glance-simplestreams-sync
num_units: 1
to:
- '6'
ceph-radosgw:
charm: cs:~openstack-charmers/ceph-radosgw
num_units: 1
options:
source: *source
to:
- '7'
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *source
to:
- '8'
- '9'
- '10'
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *source
to:
- '11'
- '12'
- '13'
relations:
- ['keystone:certificates', 'vault:certificates']
- ['glance:certificates', 'vault:certificates']
- ['glance-simplestreams-sync:certificates', 'vault:certificates']
- ['glance:identity-service', 'keystone:identity-service']
- ['glance-simplestreams-sync:identity-service', 'keystone:identity-service']
- ['keystone:shared-db','keystone-mysql-router:shared-db']
- ['glance:shared-db','glance-mysql-router:shared-db']
- ['glance:ceph', 'ceph-mon:client']
- ['vault:shared-db','vault-mysql-router:shared-db']
- ['keystone-mysql-router:db-router','mysql-innodb-cluster:db-router']
- ['glance-mysql-router:db-router','mysql-innodb-cluster:db-router']
- ['vault-mysql-router:db-router','mysql-innodb-cluster:db-router']
- ['ceph-osd:mon', 'ceph-mon:osd']
- ['ceph-radosgw:mon', 'ceph-mon:radosgw']
- ['ceph-radosgw:identity-service', 'keystone:identity-service']
- ['ceph-radosgw:certificates', 'vault:certificates']

View File

@ -1,122 +0,0 @@
variables:
source: &source distro
series: groovy
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
'1':
'2':
'3':
'4':
'5':
'6':
'7':
'8':
constraints: "mem=2048"
'9':
constraints: "mem=2048"
'10':
constraints: "mem=2048"
'11':
'12':
'13':
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
vault-mysql-router:
charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *source
to:
- '0'
- '1'
- '2'
vault:
charm: cs:~openstack-charmers/vault
num_units: 1
to:
- '3'
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '4'
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
to:
- '5'
glance-simplestreams-sync:
charm: ../../glance-simplestreams-sync
num_units: 1
to:
- '6'
ceph-radosgw:
charm: cs:~openstack-charmers/ceph-radosgw
num_units: 1
options:
source: *source
to:
- '7'
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *source
to:
- '8'
- '9'
- '10'
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *source
to:
- '11'
- '12'
- '13'
relations:
- ['keystone:certificates', 'vault:certificates']
- ['glance:certificates', 'vault:certificates']
- ['glance-simplestreams-sync:certificates', 'vault:certificates']
- ['glance:identity-service', 'keystone:identity-service']
- ['glance-simplestreams-sync:identity-service', 'keystone:identity-service']
- ['keystone:shared-db','keystone-mysql-router:shared-db']
- ['glance:shared-db','glance-mysql-router:shared-db']
- ['glance:ceph', 'ceph-mon:client']
- ['vault:shared-db','vault-mysql-router:shared-db']
- ['keystone-mysql-router:db-router','mysql-innodb-cluster:db-router']
- ['glance-mysql-router:db-router','mysql-innodb-cluster:db-router']
- ['vault-mysql-router:db-router','mysql-innodb-cluster:db-router']
- ['ceph-osd:mon', 'ceph-mon:osd']
- ['ceph-radosgw:mon', 'ceph-mon:radosgw']
- ['ceph-radosgw:identity-service', 'keystone:identity-service']
- ['ceph-radosgw:certificates', 'vault:certificates']

View File

@ -1,122 +0,0 @@
variables:
source: &source distro
series: hirsute
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
'1':
'2':
'3':
'4':
'5':
'6':
'7':
'8':
constraints: "mem=2048"
'9':
constraints: "mem=2048"
'10':
constraints: "mem=2048"
'11':
'12':
'13':
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
vault-mysql-router:
charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *source
to:
- '0'
- '1'
- '2'
vault:
charm: cs:~openstack-charmers/vault
num_units: 1
to:
- '3'
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '4'
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
to:
- '5'
glance-simplestreams-sync:
charm: ../../glance-simplestreams-sync
num_units: 1
to:
- '6'
ceph-radosgw:
charm: cs:~openstack-charmers/ceph-radosgw
num_units: 1
options:
source: *source
to:
- '7'
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *source
to:
- '8'
- '9'
- '10'
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *source
to:
- '11'
- '12'
- '13'
relations:
- ['keystone:certificates', 'vault:certificates']
- ['glance:certificates', 'vault:certificates']
- ['glance-simplestreams-sync:certificates', 'vault:certificates']
- ['glance:identity-service', 'keystone:identity-service']
- ['glance-simplestreams-sync:identity-service', 'keystone:identity-service']
- ['keystone:shared-db','keystone-mysql-router:shared-db']
- ['glance:shared-db','glance-mysql-router:shared-db']
- ['glance:ceph', 'ceph-mon:client']
- ['vault:shared-db','vault-mysql-router:shared-db']
- ['keystone-mysql-router:db-router','mysql-innodb-cluster:db-router']
- ['glance-mysql-router:db-router','mysql-innodb-cluster:db-router']
- ['vault-mysql-router:db-router','mysql-innodb-cluster:db-router']
- ['ceph-osd:mon', 'ceph-mon:osd']
- ['ceph-radosgw:mon', 'ceph-mon:radosgw']
- ['ceph-radosgw:identity-service', 'keystone:identity-service']
- ['ceph-radosgw:certificates', 'vault:certificates']

View File

@ -1,122 +0,0 @@
variables:
source: &source distro
series: impish
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
'1':
'2':
'3':
'4':
'5':
'6':
'7':
'8':
constraints: "mem=2048"
'9':
constraints: "mem=2048"
'10':
constraints: "mem=2048"
'11':
'12':
'13':
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
vault-mysql-router:
charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *source
to:
- '0'
- '1'
- '2'
vault:
charm: cs:~openstack-charmers/vault
num_units: 1
to:
- '3'
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '4'
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
to:
- '5'
glance-simplestreams-sync:
charm: ../../glance-simplestreams-sync
num_units: 1
to:
- '6'
ceph-radosgw:
charm: cs:~openstack-charmers/ceph-radosgw
num_units: 1
options:
source: *source
to:
- '7'
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *source
to:
- '8'
- '9'
- '10'
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *source
to:
- '11'
- '12'
- '13'
relations:
- ['keystone:certificates', 'vault:certificates']
- ['glance:certificates', 'vault:certificates']
- ['glance-simplestreams-sync:certificates', 'vault:certificates']
- ['glance:identity-service', 'keystone:identity-service']
- ['glance-simplestreams-sync:identity-service', 'keystone:identity-service']
- ['keystone:shared-db','keystone-mysql-router:shared-db']
- ['glance:shared-db','glance-mysql-router:shared-db']
- ['glance:ceph', 'ceph-mon:client']
- ['vault:shared-db','vault-mysql-router:shared-db']
- ['keystone-mysql-router:db-router','mysql-innodb-cluster:db-router']
- ['glance-mysql-router:db-router','mysql-innodb-cluster:db-router']
- ['vault-mysql-router:db-router','mysql-innodb-cluster:db-router']
- ['ceph-osd:mon', 'ceph-mon:osd']
- ['ceph-radosgw:mon', 'ceph-mon:radosgw']
- ['ceph-radosgw:identity-service', 'keystone:identity-service']
- ['ceph-radosgw:certificates', 'vault:certificates']

View File

@ -1,97 +0,0 @@
options:
source: &source distro
series: xenial
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
'1':
'2':
'3':
'4':
'5':
'6':
constraints: "mem=2048"
'7':
constraints: "mem=2048"
'8':
constraints: "mem=2048"
'9':
'10':
'11':
relations:
- ['vault:shared-db', 'mysql:shared-db']
- ['keystone:shared-db', 'mysql:shared-db']
- ['glance:shared-db', 'mysql:shared-db']
- ['glance:ceph', 'ceph-mon:client']
- ['keystone:certificates', 'vault:certificates']
- ['glance:certificates', 'vault:certificates']
- ['glance-simplestreams-sync:certificates', 'vault:certificates']
- ['glance:identity-service', 'keystone:identity-service']
- ['glance-simplestreams-sync:identity-service', 'keystone:identity-service']
- ['ceph-osd:mon', 'ceph-mon:osd']
- ['ceph-radosgw:mon', 'ceph-mon:radosgw']
- ['ceph-radosgw:identity-service', 'keystone:identity-service']
- ['ceph-radosgw:certificates', 'vault:certificates']
applications:
mysql:
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
to:
- '0'
vault:
charm: cs:~openstack-charmers/vault
num_units: 1
to:
- '1'
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '2'
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
to:
- '3'
glance-simplestreams-sync:
charm: ../../glance-simplestreams-sync
num_units: 1
to:
- '4'
ceph-radosgw:
charm: cs:~openstack-charmers/ceph-radosgw
num_units: 1
options:
source: *source
to:
- '5'
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *source
to:
- '6'
- '7'
- '8'
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *source
to:
- '9'
- '10'
- '11'

View File

@ -1,97 +0,0 @@
options:
source: &source cloud:xenial-queens
series: xenial
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
'1':
'2':
'3':
'4':
'5':
'6':
constraints: "mem=2048"
'7':
constraints: "mem=2048"
'8':
constraints: "mem=2048"
'9':
'10':
'11':
relations:
- ['vault:shared-db', 'mysql:shared-db']
- ['keystone:shared-db', 'mysql:shared-db']
- ['glance:shared-db', 'mysql:shared-db']
- ['glance:ceph', 'ceph-mon:client']
- ['keystone:certificates', 'vault:certificates']
- ['glance:certificates', 'vault:certificates']
- ['glance-simplestreams-sync:certificates', 'vault:certificates']
- ['glance:identity-service', 'keystone:identity-service']
- ['glance-simplestreams-sync:identity-service', 'keystone:identity-service']
- ['ceph-osd:mon', 'ceph-mon:osd']
- ['ceph-radosgw:mon', 'ceph-mon:radosgw']
- ['ceph-radosgw:identity-service', 'keystone:identity-service']
- ['ceph-radosgw:certificates', 'vault:certificates']
applications:
mysql:
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
to:
- '0'
vault:
charm: cs:~openstack-charmers/vault
num_units: 1
to:
- '1'
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '2'
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
to:
- '3'
glance-simplestreams-sync:
charm: ../../glance-simplestreams-sync
num_units: 1
to:
- '4'
ceph-radosgw:
charm: cs:~openstack-charmers/ceph-radosgw
num_units: 1
options:
source: *source
to:
- '5'
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *source
to:
- '6'
- '7'
- '8'
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *source
to:
- '9'
- '10'
- '11'

View File

@ -6,33 +6,20 @@ comment:
# functest-run-suite ...
# functest-deploy --bundle /path/to/gate/bundle
gate_bundles:
- xenial-mitaka
- bionic-queens
- bionic-rocky
- bionic-stein
- bionic-train
- bionic-ussuri
- focal-ussuri
- focal-wallaby
- focal-xena
- hirsute-wallaby
dev_bundles:
- xenial-queens
- bionic-rocky
- focal-victoria
- groovy-victoria
- impish-xena
dev_bundles: []
tests_options:
force_deploy:
- groovy-victoria
- impish-xena
force_deploy: []
# functest-run-suite --smoke ...
# functest-deploy --bundle /path/to/smoke/bundle
# smoke bundle should (Ubuntu LTS latest)-(OpenStack latest)
smoke_bundles:
- focal-ussuri
smoke_bundles: []
# special target deploy status for above deploy phase
target_deploy_status:

24
tox.ini
View File

@ -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,21 @@ deps = -r{toxinidir}/requirements.txt
basepython = python3.6
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[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
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
[testenv:pep8]
basepython = python3