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: I99a6bfb4900c4e19b0c4ca427b29fcd72c38ae2a
This commit is contained in:
Alex Kavanagh
1
.gitignore
vendored
1
.gitignore
vendored
@@ -9,3 +9,4 @@ cover
|
||||
*.pyc
|
||||
build
|
||||
func-results.json
|
||||
*.charm
|
||||
|
||||
@@ -3,4 +3,4 @@ host=review.opendev.org
|
||||
port=29418
|
||||
project=openstack/charm-cinder-backup-swift-proxy.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
|
||||
|
||||
7
build-requirements.txt
Normal file
7
build-requirements.txt
Normal 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.
|
||||
30
charmcraft.yaml
Normal file
30
charmcraft.yaml
Normal file
@@ -0,0 +1,30 @@
|
||||
type: charm
|
||||
|
||||
parts:
|
||||
charm:
|
||||
build-packages:
|
||||
- tox
|
||||
- git
|
||||
- python3-dev
|
||||
override-build: |
|
||||
apt-get install ca-certificates -y
|
||||
tox -e build-reactive
|
||||
override-stage: |
|
||||
echo "Copying charm to staging area: $CHARMCRAFT_STAGE"
|
||||
NAME=$(ls $CHARMCRAFT_PART_BUILD/build/builds)
|
||||
cp -r $CHARMCRAFT_PART_BUILD/build/builds/$NAME/* $CHARMCRAFT_STAGE/
|
||||
override-prime: |
|
||||
# For some reason, the normal priming chokes on the fact that there's a
|
||||
# hooks directory.
|
||||
cp -r $CHARMCRAFT_STAGE/* .
|
||||
|
||||
bases:
|
||||
- build-on:
|
||||
- name: ubuntu
|
||||
channel: "20.04"
|
||||
architectures:
|
||||
- amd64
|
||||
run-on:
|
||||
- name: ubuntu
|
||||
channel: "20.04"
|
||||
architectures: [amd64, s390x, ppc64el, arm64]
|
||||
1
metadata.yaml
Symbolic link
1
metadata.yaml
Symbolic link
@@ -0,0 +1 @@
|
||||
src/metadata.yaml
|
||||
79
osci.yaml
79
osci.yaml
@@ -1,71 +1,30 @@
|
||||
- project:
|
||||
templates:
|
||||
- charm-unit-jobs
|
||||
- charm-unit-jobs-py38
|
||||
check:
|
||||
jobs:
|
||||
- hirsute-wallaby-swift-v3
|
||||
- groovy-victoria-swift-v3
|
||||
- focal-wallaby-swift-v3
|
||||
# Disabled due to Bug: #1890821
|
||||
# - focal-victoria-swift-v3
|
||||
# - focal-ussuri-swift-v3
|
||||
- bionic-queens-swift-v3
|
||||
- bionic-queens-swift-v2
|
||||
- focal-victoria-swift-v3:
|
||||
voting: false
|
||||
- focal-wallaby-swift-v3
|
||||
vars:
|
||||
needs_charm_build: true
|
||||
charm_build_name: cinder-backup-swift-proxy
|
||||
build_type: charmcraft
|
||||
|
||||
- job:
|
||||
name: hirsute-wallaby-swift-v3
|
||||
parent: func-target
|
||||
dependencies: &smoke-jobs
|
||||
- bionic-queens-swift-v3
|
||||
- bionic-queens-swift-v2
|
||||
vars:
|
||||
tox_extra_args: hirsute-wallaby-swift-v3
|
||||
name: focal-wallaby-swift-v3
|
||||
parent: func-target
|
||||
dependencies:
|
||||
- charm-build
|
||||
- osci-lint
|
||||
- tox-py38
|
||||
vars:
|
||||
tox_extra_args: focal-wallaby-swift-v3
|
||||
- job:
|
||||
name: groovy-victoria-swift-v3
|
||||
parent: func-target
|
||||
dependencies: *smoke-jobs
|
||||
vars:
|
||||
tox_extra_args: groovy-victoria-swift-v3
|
||||
- job:
|
||||
name: focal-wallaby-swift-v3
|
||||
parent: func-target
|
||||
dependencies: *smoke-jobs
|
||||
vars:
|
||||
tox_extra_args: focal-wallaby-swift-v3
|
||||
# - job:
|
||||
# name: focal-victoria-swift-v3
|
||||
# parent: func-target
|
||||
# dependencies: *smoke-jobs
|
||||
# vars:
|
||||
# tox_extra_args: focal-victoria-swift-v3
|
||||
# - job:
|
||||
# name: focal-ussuri-swift-v3
|
||||
# parent: func-target
|
||||
# dependencies: *smoke-jobs
|
||||
# vars:
|
||||
# tox_extra_args: focal-ussuri-swift-v3
|
||||
- job:
|
||||
name: bionic-queens-swift-v3
|
||||
parent: func-target
|
||||
dependencies:
|
||||
- osci-lint
|
||||
- tox-py35
|
||||
- tox-py36
|
||||
- tox-py37
|
||||
- tox-py38
|
||||
vars:
|
||||
tox_extra_args: bionic-queens-swift-v3
|
||||
- job:
|
||||
name: bionic-queens-swift-v2
|
||||
parent: func-target
|
||||
dependencies:
|
||||
- osci-lint
|
||||
- tox-py35
|
||||
- tox-py36
|
||||
- tox-py37
|
||||
- tox-py38
|
||||
vars:
|
||||
tox_extra_args: bionic-queens-swift-v2
|
||||
name: focal-victoria-swift-v3
|
||||
parent: func-target
|
||||
dependencies:
|
||||
- focal-wallaby-swift-v3
|
||||
vars:
|
||||
tox_extra_args: focal-victoria-swift-v3
|
||||
|
||||
13
rename.sh
Executable file
13
rename.sh
Executable 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
|
||||
@@ -9,6 +9,7 @@
|
||||
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
||||
|
||||
# Build requirements
|
||||
pyparsing<3.0.0 # cffi needs pyparsing < 3.0.0.
|
||||
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
|
||||
charm-tools==2.8.3
|
||||
|
||||
|
||||
@@ -108,17 +108,11 @@
|
||||
"vcs": null,
|
||||
"version": "1.1.1"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "Tempita",
|
||||
"vcs": null,
|
||||
"version": "0.4"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "charms.openstack",
|
||||
"url": "git+https://github.com/openstack/charms.openstack.git",
|
||||
"branch": "refs/heads/stable/21.10",
|
||||
"branch": "stable/wallaby",
|
||||
"version": "10627ee5f991c268f174d6d100e218a0e1867af1",
|
||||
"vcs": "git"
|
||||
},
|
||||
@@ -138,8 +132,8 @@
|
||||
"type": "python_module",
|
||||
"package": "charmhelpers",
|
||||
"url": "git+https://github.com/juju/charm-helpers.git",
|
||||
"branch": "refs/heads/stable/21.10",
|
||||
"version": "26efcd0da51d580f68ead2ca13c38f58766f8a14",
|
||||
"branch": "stable/wallaby",
|
||||
"version": "f8f822d5e908b1ac5694815c2d5522b6533e04f8",
|
||||
"vcs": "git"
|
||||
},
|
||||
{
|
||||
|
||||
@@ -8,11 +8,7 @@ description: |
|
||||
tags:
|
||||
- misc
|
||||
series:
|
||||
- bionic
|
||||
- focal
|
||||
- groovy
|
||||
- hirsute
|
||||
- impish
|
||||
subordinate: true
|
||||
provides:
|
||||
backup-backend:
|
||||
|
||||
@@ -5,5 +5,9 @@
|
||||
#
|
||||
|
||||
# Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
|
||||
git+https://github.com/openstack-charmers/zaza.git@stable/21.10#egg=zaza
|
||||
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.10#egg=zaza.openstack
|
||||
git+https://github.com/openstack-charmers/zaza.git@stable/wallaby#egg=zaza
|
||||
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/wallaby#egg=zaza.openstack
|
||||
|
||||
# Need tox to be available from tox... inception yes, but its a workaround for now
|
||||
tox
|
||||
|
||||
|
||||
@@ -1,140 +0,0 @@
|
||||
series: bionic
|
||||
relations:
|
||||
- - nova-compute:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - keystone:shared-db
|
||||
- mysql:shared-db
|
||||
- - nova-cloud-controller:identity-service
|
||||
- keystone:identity-service
|
||||
- - glance:identity-service
|
||||
- keystone:identity-service
|
||||
- - glance:shared-db
|
||||
- mysql:shared-db
|
||||
- - glance:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - nova-cloud-controller:image-service
|
||||
- glance:image-service
|
||||
- - nova-compute:image-service
|
||||
- glance:image-service
|
||||
- - nova-cloud-controller:cloud-compute
|
||||
- nova-compute:cloud-compute
|
||||
- - nova-cloud-controller:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - nova-cloud-controller:shared-db
|
||||
- mysql:shared-db
|
||||
- - cinder:image-service
|
||||
- glance:image-service
|
||||
- - cinder:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - cinder:identity-service
|
||||
- keystone:identity-service
|
||||
- - cinder:cinder-volume-service
|
||||
- nova-cloud-controller:cinder-volume-service
|
||||
- - cinder-ceph:storage-backend
|
||||
- cinder:storage-backend
|
||||
- - cinder
|
||||
- cinder-backup-swift-proxy
|
||||
- - ceph-mon:client
|
||||
- nova-compute:ceph
|
||||
- - nova-compute:ceph-access
|
||||
- cinder-ceph:ceph-access
|
||||
- - cinder:shared-db
|
||||
- mysql:shared-db
|
||||
- - ceph-mon:client
|
||||
- cinder-ceph:ceph
|
||||
- - ceph-mon:client
|
||||
- glance:ceph
|
||||
- - ceph-osd:mon
|
||||
- ceph-mon:osd
|
||||
|
||||
# external swift service
|
||||
- - swift-keystone:shared-db
|
||||
- swift-mysql:shared-db
|
||||
- - swift-proxy:identity-service
|
||||
- swift-keystone:identity-service
|
||||
- - swift-proxy:swift-storage
|
||||
- swift-storage:swift-storage
|
||||
|
||||
applications:
|
||||
ceph-mon:
|
||||
charm: cs:~openstack-charmers/ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
monitor-count: '3'
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers/ceph-osd
|
||||
num_units: 3
|
||||
storage:
|
||||
osd-devices: 'cinder,10G'
|
||||
cinder:
|
||||
charm: cs:~openstack-charmers/cinder
|
||||
num_units: 1
|
||||
options:
|
||||
block-device: None
|
||||
glance-api-version: 2
|
||||
cinder-ceph:
|
||||
charm: cs:~openstack-charmers/cinder-ceph
|
||||
num_units: 0
|
||||
cinder-backup-swift-proxy:
|
||||
charm: cinder-backup-swift-proxy
|
||||
num_units: 0
|
||||
options:
|
||||
auth-version: 3
|
||||
swift-user: admin
|
||||
swift-key: openstack
|
||||
user-domain: admin_domain
|
||||
project-domain: admin_domain
|
||||
project-name: admin
|
||||
glance:
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
mysql:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
dataset-size: 25%
|
||||
max-connections: 1000
|
||||
nova-cloud-controller:
|
||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
||||
num_units: 1
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers/nova-compute
|
||||
num_units: 1
|
||||
|
||||
# external swift
|
||||
swift-keystone:
|
||||
series: xenial
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
admin-password: openstack
|
||||
preferred-api-version: 3
|
||||
swift-mysql:
|
||||
series: xenial
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
dataset-size: 25%
|
||||
max-connections: 1000
|
||||
swift-proxy:
|
||||
series: xenial
|
||||
charm: cs:~openstack-charmers/swift-proxy
|
||||
num_units: 1
|
||||
options:
|
||||
zone-assignment: manual
|
||||
replicas: 1
|
||||
swift-storage:
|
||||
series: xenial
|
||||
charm: cs:~openstack-charmers/swift-storage
|
||||
num_units: 1
|
||||
options:
|
||||
zone: 1
|
||||
storage:
|
||||
block-devices: 'cinder,10G'
|
||||
|
||||
@@ -1,135 +0,0 @@
|
||||
series: bionic
|
||||
relations:
|
||||
- - nova-compute:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - keystone:shared-db
|
||||
- mysql:shared-db
|
||||
- - nova-cloud-controller:identity-service
|
||||
- keystone:identity-service
|
||||
- - glance:identity-service
|
||||
- keystone:identity-service
|
||||
- - glance:shared-db
|
||||
- mysql:shared-db
|
||||
- - glance:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - nova-cloud-controller:image-service
|
||||
- glance:image-service
|
||||
- - nova-compute:image-service
|
||||
- glance:image-service
|
||||
- - nova-cloud-controller:cloud-compute
|
||||
- nova-compute:cloud-compute
|
||||
- - nova-cloud-controller:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - nova-cloud-controller:shared-db
|
||||
- mysql:shared-db
|
||||
- - cinder:image-service
|
||||
- glance:image-service
|
||||
- - cinder:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - cinder:identity-service
|
||||
- keystone:identity-service
|
||||
- - cinder:cinder-volume-service
|
||||
- nova-cloud-controller:cinder-volume-service
|
||||
- - cinder-ceph:storage-backend
|
||||
- cinder:storage-backend
|
||||
- - cinder
|
||||
- cinder-backup-swift-proxy
|
||||
- - ceph-mon:client
|
||||
- nova-compute:ceph
|
||||
- - nova-compute:ceph-access
|
||||
- cinder-ceph:ceph-access
|
||||
- - cinder:shared-db
|
||||
- mysql:shared-db
|
||||
- - ceph-mon:client
|
||||
- cinder-ceph:ceph
|
||||
- - ceph-mon:client
|
||||
- glance:ceph
|
||||
- - ceph-osd:mon
|
||||
- ceph-mon:osd
|
||||
|
||||
# external swift service
|
||||
- - swift-keystone:shared-db
|
||||
- swift-mysql:shared-db
|
||||
- - swift-proxy:identity-service
|
||||
- swift-keystone:identity-service
|
||||
- - swift-proxy:swift-storage
|
||||
- swift-storage:swift-storage
|
||||
|
||||
applications:
|
||||
ceph-mon:
|
||||
charm: cs:~openstack-charmers/ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
monitor-count: '3'
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers/ceph-osd
|
||||
num_units: 3
|
||||
storage:
|
||||
osd-devices: 'cinder,10G'
|
||||
cinder:
|
||||
charm: cs:~openstack-charmers/cinder
|
||||
num_units: 1
|
||||
options:
|
||||
block-device: None
|
||||
glance-api-version: 2
|
||||
cinder-ceph:
|
||||
charm: cs:~openstack-charmers/cinder-ceph
|
||||
num_units: 0
|
||||
cinder-backup-swift-proxy:
|
||||
charm: cinder-backup-swift-proxy
|
||||
num_units: 0
|
||||
options:
|
||||
auth-version: 3
|
||||
swift-user: admin
|
||||
swift-key: openstack
|
||||
user-domain: admin_domain
|
||||
project-domain: admin_domain
|
||||
project-name: admin
|
||||
glance:
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
mysql:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
dataset-size: 25%
|
||||
max-connections: 1000
|
||||
nova-cloud-controller:
|
||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
||||
num_units: 1
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers/nova-compute
|
||||
num_units: 1
|
||||
|
||||
# external swift
|
||||
swift-keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
admin-password: openstack
|
||||
preferred-api-version: 3
|
||||
swift-mysql:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
dataset-size: 25%
|
||||
max-connections: 1000
|
||||
swift-proxy:
|
||||
charm: cs:~openstack-charmers/swift-proxy
|
||||
num_units: 1
|
||||
options:
|
||||
zone-assignment: manual
|
||||
replicas: 1
|
||||
swift-storage:
|
||||
charm: cs:~openstack-charmers/swift-storage
|
||||
num_units: 1
|
||||
options:
|
||||
zone: 1
|
||||
storage:
|
||||
block-devices: 'cinder,10G'
|
||||
@@ -1,307 +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':
|
||||
constraints: mem=3072M
|
||||
'4':
|
||||
constraints: mem=3072M
|
||||
'5':
|
||||
constraints: mem=3072M
|
||||
'6':
|
||||
'7':
|
||||
'8':
|
||||
'9':
|
||||
'10':
|
||||
'11':
|
||||
'12':
|
||||
'13':
|
||||
'14':
|
||||
'15':
|
||||
'16':
|
||||
'17':
|
||||
'18':
|
||||
'19':
|
||||
'20':
|
||||
'21':
|
||||
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
glance-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
nova-cloud-controller-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
cinder-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
placement-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'
|
||||
|
||||
ceph-mon:
|
||||
charm: cs:~openstack-charmers/ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
monitor-count: '3'
|
||||
to:
|
||||
- '6'
|
||||
- '7'
|
||||
- '8'
|
||||
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers/ceph-osd
|
||||
num_units: 3
|
||||
storage:
|
||||
osd-devices: 'cinder,10G'
|
||||
options:
|
||||
source: *openstack-origin
|
||||
osd-devices: '/dev/test-non-existent'
|
||||
to:
|
||||
- '9'
|
||||
- '10'
|
||||
- '11'
|
||||
|
||||
cinder:
|
||||
charm: cs:~openstack-charmers/cinder
|
||||
num_units: 1
|
||||
options:
|
||||
block-device: None
|
||||
openstack-origin: *openstack-origin
|
||||
glance-api-version: 2
|
||||
to:
|
||||
- '12'
|
||||
|
||||
cinder-ceph:
|
||||
charm: cs:~openstack-charmers/cinder-ceph
|
||||
num_units: 0
|
||||
|
||||
cinder-backup-swift-proxy:
|
||||
charm: cinder-backup-swift-proxy
|
||||
num_units: 0
|
||||
options:
|
||||
auth-version: 3
|
||||
swift-user: admin
|
||||
swift-key: openstack
|
||||
user-domain: admin_domain
|
||||
project-domain: admin_domain
|
||||
project-name: admin
|
||||
|
||||
glance:
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '13'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '14'
|
||||
|
||||
nova-cloud-controller:
|
||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '15'
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '16'
|
||||
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers/nova-compute
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '17'
|
||||
|
||||
placement:
|
||||
charm: cs:~openstack-charmers/placement
|
||||
num_units: 1
|
||||
constraints: mem=1G
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '18'
|
||||
|
||||
# external swift
|
||||
swift-keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
|
||||
swift-mysql-innodb-cluster:
|
||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
- '4'
|
||||
- '5'
|
||||
|
||||
swift-keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
admin-password: openstack
|
||||
preferred-api-version: 3
|
||||
to:
|
||||
- '19'
|
||||
|
||||
|
||||
swift-proxy:
|
||||
charm: cs:~openstack-charmers/swift-proxy
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
zone-assignment: manual
|
||||
replicas: 1
|
||||
to:
|
||||
- '20'
|
||||
|
||||
swift-storage:
|
||||
charm: cs:~openstack-charmers/swift-storage
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
zone: 1
|
||||
storage:
|
||||
block-devices: 'cinder,10G'
|
||||
to:
|
||||
- '21'
|
||||
|
||||
|
||||
relations:
|
||||
|
||||
- - 'nova-compute:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'keystone:shared-db'
|
||||
- 'keystone-mysql-router:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'nova-cloud-controller:identity-service'
|
||||
- 'keystone:identity-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'
|
||||
|
||||
- - 'glance:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'nova-cloud-controller:image-service'
|
||||
- 'glance:image-service'
|
||||
|
||||
- - 'nova-compute:image-service'
|
||||
- 'glance:image-service'
|
||||
|
||||
- - 'nova-cloud-controller:cloud-compute'
|
||||
- 'nova-compute:cloud-compute'
|
||||
|
||||
- - 'nova-cloud-controller:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'nova-cloud-controller:shared-db'
|
||||
- 'nova-cloud-controller-mysql-router:shared-db'
|
||||
- - 'nova-cloud-controller-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'placement:shared-db'
|
||||
- 'placement-mysql-router:shared-db'
|
||||
- - 'placement-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'placement:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'placement:placement'
|
||||
- 'nova-cloud-controller:placement'
|
||||
|
||||
- - 'cinder:image-service'
|
||||
- 'glance:image-service'
|
||||
|
||||
- - 'cinder:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'cinder:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'cinder:cinder-volume-service'
|
||||
- 'nova-cloud-controller:cinder-volume-service'
|
||||
|
||||
- - 'cinder-ceph:storage-backend'
|
||||
- 'cinder:storage-backend'
|
||||
|
||||
- - 'cinder'
|
||||
- 'cinder-backup-swift-proxy'
|
||||
|
||||
- - 'ceph-mon:client'
|
||||
- 'nova-compute:ceph'
|
||||
|
||||
- - 'nova-compute:ceph-access'
|
||||
- 'cinder-ceph:ceph-access'
|
||||
|
||||
- - 'cinder:shared-db'
|
||||
- 'cinder-mysql-router:shared-db'
|
||||
- - 'cinder-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'ceph-mon:client'
|
||||
- 'cinder-ceph:ceph'
|
||||
|
||||
- - 'ceph-mon:client'
|
||||
- 'glance:ceph'
|
||||
|
||||
- - 'ceph-osd:mon'
|
||||
- 'ceph-mon:osd'
|
||||
|
||||
# external swift service
|
||||
- - 'swift-keystone:shared-db'
|
||||
- 'swift-keystone-mysql-router:shared-db'
|
||||
- - 'swift-keystone-mysql-router:db-router'
|
||||
- 'swift-mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'swift-proxy:identity-service'
|
||||
- 'swift-keystone:identity-service'
|
||||
|
||||
- - 'swift-proxy:swift-storage'
|
||||
- 'swift-storage:swift-storage'
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
local_overlay_enabled: False
|
||||
|
||||
variables:
|
||||
openstack-origin: &openstack-origin cloud:focal-victoria
|
||||
|
||||
@@ -38,18 +40,23 @@ machines:
|
||||
applications:
|
||||
|
||||
keystone-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
|
||||
nova-cloud-controller-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
|
||||
placement-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
|
||||
@@ -57,9 +64,10 @@ applications:
|
||||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
channel: 8.0/edge
|
||||
|
||||
ceph-mon:
|
||||
charm: cs:~openstack-charmers/ceph-mon
|
||||
charm: ch:ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
@@ -68,9 +76,10 @@ applications:
|
||||
- '6'
|
||||
- '7'
|
||||
- '8'
|
||||
channel: pacific/edge
|
||||
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers/ceph-osd
|
||||
charm: ch:ceph-osd
|
||||
num_units: 3
|
||||
storage:
|
||||
osd-devices: 'cinder,10G'
|
||||
@@ -81,9 +90,10 @@ applications:
|
||||
- '9'
|
||||
- '10'
|
||||
- '11'
|
||||
channel: pacific/edge
|
||||
|
||||
cinder:
|
||||
charm: cs:~openstack-charmers/cinder
|
||||
charm: ch:cinder
|
||||
num_units: 1
|
||||
options:
|
||||
block-device: None
|
||||
@@ -91,13 +101,15 @@ applications:
|
||||
glance-api-version: 2
|
||||
to:
|
||||
- '12'
|
||||
channel: wallaby/edge
|
||||
|
||||
cinder-ceph:
|
||||
charm: cs:~openstack-charmers/cinder-ceph
|
||||
charm: ch:cinder-ceph
|
||||
num_units: 0
|
||||
channel: wallaby/edge
|
||||
|
||||
cinder-backup-swift-proxy:
|
||||
charm: cinder-backup-swift-proxy
|
||||
charm: ../../../cinder-backup-swift-proxy.charm
|
||||
num_units: 0
|
||||
options:
|
||||
auth-version: 3
|
||||
@@ -108,60 +120,67 @@ applications:
|
||||
project-name: admin
|
||||
|
||||
glance:
|
||||
charm: cs:~openstack-charmers/glance
|
||||
charm: ch:glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '13'
|
||||
channel: wallaby/edge
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
charm: ch:keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '14'
|
||||
channel: wallaby/edge
|
||||
|
||||
nova-cloud-controller:
|
||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
||||
charm: ch:nova-cloud-controller
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '15'
|
||||
channel: wallaby/edge
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '16'
|
||||
channel: 3.8/edge
|
||||
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers/nova-compute
|
||||
charm: ch:nova-compute
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '17'
|
||||
channel: wallaby/edge
|
||||
|
||||
placement:
|
||||
charm: cs:~openstack-charmers/placement
|
||||
charm: ch:placement
|
||||
num_units: 1
|
||||
constraints: mem=1G
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '18'
|
||||
channel: wallaby/edge
|
||||
|
||||
# external swift
|
||||
swift-keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
charm: ch:mysql-router
|
||||
channel: 8.0/edge
|
||||
|
||||
swift-mysql-innodb-cluster:
|
||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
||||
charm: ch:mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
@@ -169,9 +188,10 @@ applications:
|
||||
- '3'
|
||||
- '4'
|
||||
- '5'
|
||||
channel: 8.0/edge
|
||||
|
||||
swift-keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
charm: ch:keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
@@ -179,10 +199,11 @@ applications:
|
||||
preferred-api-version: 3
|
||||
to:
|
||||
- '19'
|
||||
channel: wallaby/edge
|
||||
|
||||
|
||||
swift-proxy:
|
||||
charm: cs:~openstack-charmers/swift-proxy
|
||||
charm: ch:swift-proxy
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
@@ -190,9 +211,10 @@ applications:
|
||||
replicas: 1
|
||||
to:
|
||||
- '20'
|
||||
channel: wallaby/edge
|
||||
|
||||
swift-storage:
|
||||
charm: cs:~openstack-charmers/swift-storage
|
||||
charm: ch:swift-storage
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
@@ -201,6 +223,7 @@ applications:
|
||||
block-devices: 'cinder,10G'
|
||||
to:
|
||||
- '21'
|
||||
channel: wallaby/edge
|
||||
|
||||
|
||||
relations:
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
local_overlay_enabled: False
|
||||
|
||||
variables:
|
||||
openstack-origin: &openstack-origin cloud:focal-wallaby
|
||||
|
||||
@@ -38,18 +40,23 @@ machines:
|
||||
applications:
|
||||
|
||||
keystone-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
|
||||
nova-cloud-controller-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
|
||||
placement-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
|
||||
@@ -57,9 +64,10 @@ applications:
|
||||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
channel: 8.0/edge
|
||||
|
||||
ceph-mon:
|
||||
charm: cs:~openstack-charmers/ceph-mon
|
||||
charm: ch:ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
@@ -68,9 +76,10 @@ applications:
|
||||
- '6'
|
||||
- '7'
|
||||
- '8'
|
||||
channel: pacific/edge
|
||||
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers/ceph-osd
|
||||
charm: ch:ceph-osd
|
||||
num_units: 3
|
||||
storage:
|
||||
osd-devices: 'cinder,10G'
|
||||
@@ -81,9 +90,10 @@ applications:
|
||||
- '9'
|
||||
- '10'
|
||||
- '11'
|
||||
channel: pacific/edge
|
||||
|
||||
cinder:
|
||||
charm: cs:~openstack-charmers/cinder
|
||||
charm: ch:cinder
|
||||
num_units: 1
|
||||
options:
|
||||
block-device: None
|
||||
@@ -91,13 +101,15 @@ applications:
|
||||
glance-api-version: 2
|
||||
to:
|
||||
- '12'
|
||||
channel: wallaby/edge
|
||||
|
||||
cinder-ceph:
|
||||
charm: cs:~openstack-charmers/cinder-ceph
|
||||
charm: ch:cinder-ceph
|
||||
num_units: 0
|
||||
channel: wallaby/edge
|
||||
|
||||
cinder-backup-swift-proxy:
|
||||
charm: cinder-backup-swift-proxy
|
||||
charm: ../../../cinder-backup-swift-proxy.charm
|
||||
num_units: 0
|
||||
options:
|
||||
auth-version: 3
|
||||
@@ -108,60 +120,67 @@ applications:
|
||||
project-name: admin
|
||||
|
||||
glance:
|
||||
charm: cs:~openstack-charmers/glance
|
||||
charm: ch:glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '13'
|
||||
channel: wallaby/edge
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
charm: ch:keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '14'
|
||||
channel: wallaby/edge
|
||||
|
||||
nova-cloud-controller:
|
||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
||||
charm: ch:nova-cloud-controller
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '15'
|
||||
channel: wallaby/edge
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '16'
|
||||
channel: 3.8/edge
|
||||
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers/nova-compute
|
||||
charm: ch:nova-compute
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '17'
|
||||
channel: wallaby/edge
|
||||
|
||||
placement:
|
||||
charm: cs:~openstack-charmers/placement
|
||||
charm: ch:placement
|
||||
num_units: 1
|
||||
constraints: mem=1G
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '18'
|
||||
channel: wallaby/edge
|
||||
|
||||
# external swift
|
||||
swift-keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
charm: ch:mysql-router
|
||||
channel: 8.0/edge
|
||||
|
||||
swift-mysql-innodb-cluster:
|
||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
||||
charm: ch:mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
@@ -169,9 +188,10 @@ applications:
|
||||
- '3'
|
||||
- '4'
|
||||
- '5'
|
||||
channel: 8.0/edge
|
||||
|
||||
swift-keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
charm: ch:keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
@@ -179,10 +199,11 @@ applications:
|
||||
preferred-api-version: 3
|
||||
to:
|
||||
- '19'
|
||||
channel: wallaby/edge
|
||||
|
||||
|
||||
swift-proxy:
|
||||
charm: cs:~openstack-charmers/swift-proxy
|
||||
charm: ch:swift-proxy
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
@@ -190,9 +211,10 @@ applications:
|
||||
replicas: 1
|
||||
to:
|
||||
- '20'
|
||||
channel: wallaby/edge
|
||||
|
||||
swift-storage:
|
||||
charm: cs:~openstack-charmers/swift-storage
|
||||
charm: ch:swift-storage
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
@@ -201,6 +223,7 @@ applications:
|
||||
block-devices: 'cinder,10G'
|
||||
to:
|
||||
- '21'
|
||||
channel: wallaby/edge
|
||||
|
||||
|
||||
relations:
|
||||
|
||||
@@ -1,307 +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':
|
||||
constraints: mem=3072M
|
||||
'4':
|
||||
constraints: mem=3072M
|
||||
'5':
|
||||
constraints: mem=3072M
|
||||
'6':
|
||||
'7':
|
||||
'8':
|
||||
'9':
|
||||
'10':
|
||||
'11':
|
||||
'12':
|
||||
'13':
|
||||
'14':
|
||||
'15':
|
||||
'16':
|
||||
'17':
|
||||
'18':
|
||||
'19':
|
||||
'20':
|
||||
'21':
|
||||
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
glance-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
nova-cloud-controller-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
cinder-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
placement-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'
|
||||
|
||||
ceph-mon:
|
||||
charm: cs:~openstack-charmers/ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
monitor-count: '3'
|
||||
to:
|
||||
- '6'
|
||||
- '7'
|
||||
- '8'
|
||||
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers/ceph-osd
|
||||
num_units: 3
|
||||
storage:
|
||||
osd-devices: 'cinder,10G'
|
||||
options:
|
||||
source: *openstack-origin
|
||||
osd-devices: '/dev/test-non-existent'
|
||||
to:
|
||||
- '9'
|
||||
- '10'
|
||||
- '11'
|
||||
|
||||
cinder:
|
||||
charm: cs:~openstack-charmers/cinder
|
||||
num_units: 1
|
||||
options:
|
||||
block-device: None
|
||||
openstack-origin: *openstack-origin
|
||||
glance-api-version: 2
|
||||
to:
|
||||
- '12'
|
||||
|
||||
cinder-ceph:
|
||||
charm: cs:~openstack-charmers/cinder-ceph
|
||||
num_units: 0
|
||||
|
||||
cinder-backup-swift-proxy:
|
||||
charm: cinder-backup-swift-proxy
|
||||
num_units: 0
|
||||
options:
|
||||
auth-version: 3
|
||||
swift-user: admin
|
||||
swift-key: openstack
|
||||
user-domain: admin_domain
|
||||
project-domain: admin_domain
|
||||
project-name: admin
|
||||
|
||||
glance:
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '13'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '14'
|
||||
|
||||
nova-cloud-controller:
|
||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '15'
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '16'
|
||||
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers/nova-compute
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '17'
|
||||
|
||||
placement:
|
||||
charm: cs:~openstack-charmers/placement
|
||||
num_units: 1
|
||||
constraints: mem=1G
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '18'
|
||||
|
||||
# external swift
|
||||
swift-keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
|
||||
swift-mysql-innodb-cluster:
|
||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
- '4'
|
||||
- '5'
|
||||
|
||||
swift-keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
admin-password: openstack
|
||||
preferred-api-version: 3
|
||||
to:
|
||||
- '19'
|
||||
|
||||
|
||||
swift-proxy:
|
||||
charm: cs:~openstack-charmers/swift-proxy
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
zone-assignment: manual
|
||||
replicas: 1
|
||||
to:
|
||||
- '20'
|
||||
|
||||
swift-storage:
|
||||
charm: cs:~openstack-charmers/swift-storage
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
zone: 1
|
||||
storage:
|
||||
block-devices: 'cinder,10G'
|
||||
to:
|
||||
- '21'
|
||||
|
||||
|
||||
relations:
|
||||
|
||||
- - 'nova-compute:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'keystone:shared-db'
|
||||
- 'keystone-mysql-router:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'nova-cloud-controller:identity-service'
|
||||
- 'keystone:identity-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'
|
||||
|
||||
- - 'glance:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'nova-cloud-controller:image-service'
|
||||
- 'glance:image-service'
|
||||
|
||||
- - 'nova-compute:image-service'
|
||||
- 'glance:image-service'
|
||||
|
||||
- - 'nova-cloud-controller:cloud-compute'
|
||||
- 'nova-compute:cloud-compute'
|
||||
|
||||
- - 'nova-cloud-controller:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'nova-cloud-controller:shared-db'
|
||||
- 'nova-cloud-controller-mysql-router:shared-db'
|
||||
- - 'nova-cloud-controller-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'placement:shared-db'
|
||||
- 'placement-mysql-router:shared-db'
|
||||
- - 'placement-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'placement:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'placement:placement'
|
||||
- 'nova-cloud-controller:placement'
|
||||
|
||||
- - 'cinder:image-service'
|
||||
- 'glance:image-service'
|
||||
|
||||
- - 'cinder:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'cinder:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'cinder:cinder-volume-service'
|
||||
- 'nova-cloud-controller:cinder-volume-service'
|
||||
|
||||
- - 'cinder-ceph:storage-backend'
|
||||
- 'cinder:storage-backend'
|
||||
|
||||
- - 'cinder'
|
||||
- 'cinder-backup-swift-proxy'
|
||||
|
||||
- - 'ceph-mon:client'
|
||||
- 'nova-compute:ceph'
|
||||
|
||||
- - 'nova-compute:ceph-access'
|
||||
- 'cinder-ceph:ceph-access'
|
||||
|
||||
- - 'cinder:shared-db'
|
||||
- 'cinder-mysql-router:shared-db'
|
||||
- - 'cinder-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'ceph-mon:client'
|
||||
- 'cinder-ceph:ceph'
|
||||
|
||||
- - 'ceph-mon:client'
|
||||
- 'glance:ceph'
|
||||
|
||||
- - 'ceph-osd:mon'
|
||||
- 'ceph-mon:osd'
|
||||
|
||||
# external swift service
|
||||
- - 'swift-keystone:shared-db'
|
||||
- 'swift-keystone-mysql-router:shared-db'
|
||||
- - 'swift-keystone-mysql-router:db-router'
|
||||
- 'swift-mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'swift-proxy:identity-service'
|
||||
- 'swift-keystone:identity-service'
|
||||
|
||||
- - 'swift-proxy:swift-storage'
|
||||
- 'swift-storage:swift-storage'
|
||||
|
||||
@@ -1,307 +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':
|
||||
constraints: mem=3072M
|
||||
'4':
|
||||
constraints: mem=3072M
|
||||
'5':
|
||||
constraints: mem=3072M
|
||||
'6':
|
||||
'7':
|
||||
'8':
|
||||
'9':
|
||||
'10':
|
||||
'11':
|
||||
'12':
|
||||
'13':
|
||||
'14':
|
||||
'15':
|
||||
'16':
|
||||
'17':
|
||||
'18':
|
||||
'19':
|
||||
'20':
|
||||
'21':
|
||||
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
glance-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
nova-cloud-controller-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
cinder-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
placement-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'
|
||||
|
||||
ceph-mon:
|
||||
charm: cs:~openstack-charmers/ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
monitor-count: '3'
|
||||
to:
|
||||
- '6'
|
||||
- '7'
|
||||
- '8'
|
||||
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers/ceph-osd
|
||||
num_units: 3
|
||||
storage:
|
||||
osd-devices: 'cinder,10G'
|
||||
options:
|
||||
source: *openstack-origin
|
||||
osd-devices: '/dev/test-non-existent'
|
||||
to:
|
||||
- '9'
|
||||
- '10'
|
||||
- '11'
|
||||
|
||||
cinder:
|
||||
charm: cs:~openstack-charmers/cinder
|
||||
num_units: 1
|
||||
options:
|
||||
block-device: None
|
||||
openstack-origin: *openstack-origin
|
||||
glance-api-version: 2
|
||||
to:
|
||||
- '12'
|
||||
|
||||
cinder-ceph:
|
||||
charm: cs:~openstack-charmers/cinder-ceph
|
||||
num_units: 0
|
||||
|
||||
cinder-backup-swift-proxy:
|
||||
charm: cinder-backup-swift-proxy
|
||||
num_units: 0
|
||||
options:
|
||||
auth-version: 3
|
||||
swift-user: admin
|
||||
swift-key: openstack
|
||||
user-domain: admin_domain
|
||||
project-domain: admin_domain
|
||||
project-name: admin
|
||||
|
||||
glance:
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '13'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '14'
|
||||
|
||||
nova-cloud-controller:
|
||||
charm: cs:~openstack-charmers/nova-cloud-controller
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '15'
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '16'
|
||||
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers/nova-compute
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '17'
|
||||
|
||||
placement:
|
||||
charm: cs:~openstack-charmers/placement
|
||||
num_units: 1
|
||||
constraints: mem=1G
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '18'
|
||||
|
||||
# external swift
|
||||
swift-keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
|
||||
swift-mysql-innodb-cluster:
|
||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
- '4'
|
||||
- '5'
|
||||
|
||||
swift-keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
admin-password: openstack
|
||||
preferred-api-version: 3
|
||||
to:
|
||||
- '19'
|
||||
|
||||
|
||||
swift-proxy:
|
||||
charm: cs:~openstack-charmers/swift-proxy
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
zone-assignment: manual
|
||||
replicas: 1
|
||||
to:
|
||||
- '20'
|
||||
|
||||
swift-storage:
|
||||
charm: cs:~openstack-charmers/swift-storage
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
zone: 1
|
||||
storage:
|
||||
block-devices: 'cinder,10G'
|
||||
to:
|
||||
- '21'
|
||||
|
||||
|
||||
relations:
|
||||
|
||||
- - 'nova-compute:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'keystone:shared-db'
|
||||
- 'keystone-mysql-router:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'nova-cloud-controller:identity-service'
|
||||
- 'keystone:identity-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'
|
||||
|
||||
- - 'glance:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'nova-cloud-controller:image-service'
|
||||
- 'glance:image-service'
|
||||
|
||||
- - 'nova-compute:image-service'
|
||||
- 'glance:image-service'
|
||||
|
||||
- - 'nova-cloud-controller:cloud-compute'
|
||||
- 'nova-compute:cloud-compute'
|
||||
|
||||
- - 'nova-cloud-controller:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'nova-cloud-controller:shared-db'
|
||||
- 'nova-cloud-controller-mysql-router:shared-db'
|
||||
- - 'nova-cloud-controller-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'placement:shared-db'
|
||||
- 'placement-mysql-router:shared-db'
|
||||
- - 'placement-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'placement:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'placement:placement'
|
||||
- 'nova-cloud-controller:placement'
|
||||
|
||||
- - 'cinder:image-service'
|
||||
- 'glance:image-service'
|
||||
|
||||
- - 'cinder:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'cinder:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'cinder:cinder-volume-service'
|
||||
- 'nova-cloud-controller:cinder-volume-service'
|
||||
|
||||
- - 'cinder-ceph:storage-backend'
|
||||
- 'cinder:storage-backend'
|
||||
|
||||
- - 'cinder'
|
||||
- 'cinder-backup-swift-proxy'
|
||||
|
||||
- - 'ceph-mon:client'
|
||||
- 'nova-compute:ceph'
|
||||
|
||||
- - 'nova-compute:ceph-access'
|
||||
- 'cinder-ceph:ceph-access'
|
||||
|
||||
- - 'cinder:shared-db'
|
||||
- 'cinder-mysql-router:shared-db'
|
||||
- - 'cinder-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'ceph-mon:client'
|
||||
- 'cinder-ceph:ceph'
|
||||
|
||||
- - 'ceph-mon:client'
|
||||
- 'glance:ceph'
|
||||
|
||||
- - 'ceph-osd:mon'
|
||||
- 'ceph-mon:osd'
|
||||
|
||||
# external swift service
|
||||
- - 'swift-keystone:shared-db'
|
||||
- 'swift-keystone-mysql-router:shared-db'
|
||||
- - 'swift-keystone-mysql-router:db-router'
|
||||
- 'swift-mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'swift-proxy:identity-service'
|
||||
- 'swift-keystone:identity-service'
|
||||
|
||||
- - 'swift-proxy:swift-storage'
|
||||
- 'swift-storage:swift-storage'
|
||||
|
||||
@@ -1,21 +1,12 @@
|
||||
charm_name: cinder-backup-swift-proxy
|
||||
gate_bundles:
|
||||
- groovy-victoria-swift-v3
|
||||
- bionic-queens-swift-v3
|
||||
- bionic-queens-swift-v2
|
||||
dev_bundles:
|
||||
- hirsute-wallaby-swift-v3
|
||||
# Disabled due to Bug: #1890821
|
||||
- focal-wallaby-swift-v3
|
||||
dev_bundles:
|
||||
- focal-victoria-swift-v3
|
||||
- focal-ussuri-swift-v3
|
||||
smoke_bundles:
|
||||
- bionic-queens-swift-v3
|
||||
- bionic-queens-swift-v2
|
||||
smoke_bundles: []
|
||||
configure:
|
||||
- zaza.openstack.charm_tests.cinder_backup_swift_proxy.setup.configure_cinder_backup
|
||||
tests:
|
||||
- zaza.openstack.charm_tests.cinder_backup_swift_proxy.tests.CinderBackupSwiftTest
|
||||
tests_options:
|
||||
force_deploy:
|
||||
- hirsute-wallaby-swift-v3
|
||||
force_deploy: []
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
|
||||
git+https://github.com/openstack/charms.openstack.git@stable/21.10#egg=charms.openstack
|
||||
git+https://github.com/openstack/charms.openstack.git@stable/wallaby#egg=charms.openstack
|
||||
|
||||
git+https://github.com/juju/charm-helpers.git@stable/21.10#egg=charmhelpers
|
||||
git+https://github.com/juju/charm-helpers@stable/wallaby#egg=charmhelpers
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
# choices of *requirements.txt files for OpenStack Charms:
|
||||
# https://github.com/openstack-charmers/release-tools
|
||||
#
|
||||
pyparsing<3.0.0 # cffi needs pyparsing < 3.0.0.
|
||||
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
|
||||
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
||||
|
||||
@@ -34,7 +35,7 @@ mock>=1.2; python_version >= '3.6'
|
||||
|
||||
nose>=1.3.7
|
||||
coverage>=3.6
|
||||
git+https://github.com/openstack/charms.openstack.git@stable/21.10#egg=charms.openstack
|
||||
git+https://github.com/openstack/charms.openstack.git@stable/wallaby#egg=charms.openstack
|
||||
#
|
||||
# Revisit for removal / mock improvement:
|
||||
#
|
||||
|
||||
45
tox.ini
45
tox.ini
@@ -37,11 +37,24 @@ setenv = VIRTUAL_ENV={envdir}
|
||||
passenv = http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY
|
||||
install_command =
|
||||
{toxinidir}/pip.sh install {opts} {packages}
|
||||
allowlist_externals =
|
||||
charmcraft
|
||||
bash
|
||||
tox
|
||||
rename.sh
|
||||
deps =
|
||||
-r{toxinidir}/requirements.txt
|
||||
|
||||
[testenv:build]
|
||||
basepython = python3
|
||||
deps = -r{toxinidir}/build-requirements.txt
|
||||
commands =
|
||||
charmcraft clean
|
||||
charmcraft -v build
|
||||
{toxinidir}/rename.sh
|
||||
|
||||
[testenv:build-reactive]
|
||||
basepython = python3
|
||||
commands =
|
||||
charm-build --log-level DEBUG --use-lock-file-branches -o {toxinidir}/build/builds src {posargs}
|
||||
|
||||
@@ -55,32 +68,44 @@ basepython = python3
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
commands = stestr run --slowest {posargs}
|
||||
|
||||
[testenv:py35]
|
||||
basepython = python3.5
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
commands = stestr run --slowest {posargs}
|
||||
|
||||
[testenv:py36]
|
||||
basepython = python3.6
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
commands = stestr run --slowest {posargs}
|
||||
|
||||
[testenv:py37]
|
||||
basepython = python3.7
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
commands = stestr run --slowest {posargs}
|
||||
|
||||
[testenv:py38]
|
||||
basepython = python3.8
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
commands = stestr run --slowest {posargs}
|
||||
|
||||
[testenv:py39]
|
||||
basepython = python3.9
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
commands = stestr run --slowest {posargs}
|
||||
|
||||
[testenv:py310]
|
||||
basepython = python3.10
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
commands = stestr run --slowest {posargs}
|
||||
|
||||
[testenv:pep8]
|
||||
basepython = python3
|
||||
deps = flake8==3.9.2
|
||||
charm-tools==2.8.3
|
||||
commands = flake8 {posargs} src unit_tests
|
||||
|
||||
[testenv:func-target]
|
||||
# Hack to get functional tests working in the charmcraft
|
||||
# world. We should fix this.
|
||||
basepython = python3
|
||||
passenv = HOME TERM CS_* OS_* TEST_*
|
||||
deps = -r{toxinidir}/src/test-requirements.txt
|
||||
changedir = {toxinidir}/src
|
||||
commands =
|
||||
bash -c "if [ ! -f ../*.charm ]; then echo 'Charm does not exist. Run tox -e build'; exit 1; fi"
|
||||
tox --version
|
||||
tox -e func-target {posargs}
|
||||
|
||||
[testenv:cover]
|
||||
# Technique based heavily upon
|
||||
# https://github.com/openstack/nova/blob/master/tox.ini
|
||||
|
||||
Reference in New Issue
Block a user