Update to build using charmcraft - xena batch

Batch to add building by charmcraft for the xena batch.
Supports just wallaby and xena in gate.

Change-Id: I2884ba284f917613c59923bc2649d0ee4b023b30
This commit is contained in:
Alex Kavanagh 2022-02-23 15:37:50 +00:00 committed by Liam Young
parent 7cdafac314
commit 7354f22e90
29 changed files with 153 additions and 2669 deletions

1
.gitignore vendored
View File

@ -8,3 +8,4 @@ tags
*.pyc
.unit-state.db
func-results.json
*.charm

View File

@ -3,4 +3,4 @@ host=review.opendev.org
port=29418
project=openstack/charm-ceilometer.git
defaultbranch=stable/21.10
defaultbranch=stable/xena

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.

35
charmcraft.yaml Normal file
View File

@ -0,0 +1,35 @@
type: charm
parts:
charm:
plugin: dump
source: .
prime:
- actions/*
- charmhelpers/*
- files/*
- hooks/*
- lib/*
- templates/*
- actions.yaml
- config.yaml
- copyright
- hardening.yaml
- icon.svg
- LICENSE
- Makefile
- metadata.yaml
- README.md
bases:
- build-on:
- name: ubuntu
channel: "20.04"
architectures:
- amd64
- s390x
- ppc64el
- arm64
run-on:
- name: ubuntu
channel: "20.04"

View File

@ -14,7 +14,7 @@ options:
Setting this to True will allow supporting services to log to syslog.
openstack-origin:
type: string
default: distro
default: cloud:focal-xena
description: |
Repository from which to install. May be one of the following:
distro (default), ppa:somecustom/ppa, a deb url sources entry,

View File

@ -13,12 +13,7 @@ tags:
- telemetry
- misc
series:
- xenial
- bionic
- focal
- groovy
- hirsute
- impish
extra-bindings:
public:
admin:

View File

@ -1,10 +1,11 @@
- project:
templates:
- charm-unit-jobs
- charm-functional-jobs
- charm-unit-jobs-py38
check:
jobs:
- focal-xena:
voting: false
- impish-xena:
voting: false
- focal-xena
- focal-wallaby
vars:
needs_charm_build: true
charm_build_name: ceilometer
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

@ -38,8 +38,8 @@ 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/xena#egg=zaza
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/xena#egg=zaza.openstack
# Needed for charm-glance:
git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.6'

View File

@ -1,130 +0,0 @@
series: bionic
machines:
0: {}
1: {}
2: {}
3: {}
4: {}
5: {}
6: {}
7: {}
8: {}
9: {}
10: {}
11: {}
12: {}
13: {}
14: {}
applications:
percona-cluster:
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
max-connections: 1000
innodb-buffer-pool-size: 256M
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '1'
memcached:
charm: cs:~memcached-team/memcached
num_units: 1
to:
- '2'
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
to:
- '3'
- '4'
- '5'
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
to:
- '6'
- '7'
- '8'
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
to:
- '9'
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
to:
- '10'
nova-cloud-controller:
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
to:
- '11'
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 1
to:
- '12'
ceilometer:
num_units: 1
to:
- '13'
gnocchi:
charm: cs:~openstack-charmers/gnocchi
num_units: 1
to:
- '14'
ceilometer-agent:
charm: cs:~openstack-charmers/ceilometer-agent
relations:
- - 'ceilometer:amqp'
- 'rabbitmq-server:amqp'
- - 'ceilometer:identity-notifications'
- 'keystone:identity-notifications'
- - 'ceilometer:ceilometer-service'
- 'ceilometer-agent:ceilometer-service'
- - 'ceilometer:metric-service'
- 'gnocchi:metric-service'
- - 'ceilometer:identity-credentials'
- 'keystone:identity-credentials'
- - 'keystone:shared-db'
- 'percona-cluster:shared-db'
- - 'ceilometer-agent:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-compute:nova-ceilometer'
- 'ceilometer-agent:nova-ceilometer'
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'
- - 'glance:identity-service'
- 'keystone:identity-service'
- - 'glance:shared-db'
- 'percona-cluster:shared-db'
- - 'glance:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-compute:image-service'
- 'glance:image-service'
- - 'nova-cloud-controller:shared-db'
- 'percona-cluster:shared-db'
- - 'nova-cloud-controller:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-cloud-controller:identity-service'
- 'keystone:identity-service'
- - 'nova-cloud-controller:cloud-compute'
- 'nova-compute:cloud-compute'
- - 'nova-cloud-controller:image-service'
- 'glance:image-service'
- - 'ceph-mon:osd'
- 'ceph-osd:mon'
- - 'gnocchi:shared-db'
- 'percona-cluster:shared-db'
- - 'gnocchi:storage-ceph'
- 'ceph-mon:client'
- - 'gnocchi:coordinator-memcached'
- 'memcached:cache'
- - 'gnocchi:identity-service'
- 'keystone:identity-service'

View File

@ -1,148 +0,0 @@
options:
source: &source cloud:bionic-rocky
series: bionic
machines:
0: {}
1: {}
2: {}
3: {}
4: {}
5: {}
6: {}
7: {}
8: {}
9: {}
10: {}
11: {}
12: {}
13: {}
14: {}
applications:
percona-cluster:
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
max-connections: 1000
innodb-buffer-pool-size: 256M
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '1'
memcached:
charm: cs:~memcached-team/memcached
num_units: 1
to:
- '2'
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *source
to:
- '3'
- '4'
- '5'
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *source
to:
- '6'
- '7'
- '8'
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '9'
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
to:
- '10'
nova-cloud-controller:
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *source
to:
- '11'
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: *source
to:
- '12'
ceilometer:
num_units: 1
options:
openstack-origin: *source
to:
- '13'
gnocchi:
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *source
to:
- '14'
ceilometer-agent:
charm: cs:~openstack-charmers/ceilometer-agent
relations:
- - 'ceilometer:amqp'
- 'rabbitmq-server:amqp'
- - 'ceilometer:identity-notifications'
- 'keystone:identity-notifications'
- - 'ceilometer:ceilometer-service'
- 'ceilometer-agent:ceilometer-service'
- - 'ceilometer:metric-service'
- 'gnocchi:metric-service'
- - 'ceilometer:identity-credentials'
- 'keystone:identity-credentials'
- - 'keystone:shared-db'
- 'percona-cluster:shared-db'
- - 'ceilometer-agent:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-compute:nova-ceilometer'
- 'ceilometer-agent:nova-ceilometer'
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'
- - 'glance:identity-service'
- 'keystone:identity-service'
- - 'glance:shared-db'
- 'percona-cluster:shared-db'
- - 'glance:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-compute:image-service'
- 'glance:image-service'
- - 'nova-cloud-controller:shared-db'
- 'percona-cluster:shared-db'
- - 'nova-cloud-controller:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-cloud-controller:identity-service'
- 'keystone:identity-service'
- - 'nova-cloud-controller:cloud-compute'
- 'nova-compute:cloud-compute'
- - 'nova-cloud-controller:image-service'
- 'glance:image-service'
- - 'ceph-mon:osd'
- 'ceph-osd:mon'
- - 'gnocchi:shared-db'
- 'percona-cluster:shared-db'
- - 'gnocchi:storage-ceph'
- 'ceph-mon:client'
- - 'gnocchi:coordinator-memcached'
- 'memcached:cache'
- - 'gnocchi:identity-service'
- 'keystone:identity-service'

View File

@ -1,148 +0,0 @@
options:
source: &source cloud:bionic-stein
series: bionic
machines:
0: {}
1: {}
2: {}
3: {}
4: {}
5: {}
6: {}
7: {}
8: {}
9: {}
10: {}
11: {}
12: {}
13: {}
14: {}
applications:
percona-cluster:
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
max-connections: 1000
innodb-buffer-pool-size: 256M
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '1'
memcached:
charm: cs:~memcached-team/memcached
num_units: 1
to:
- '2'
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *source
to:
- '3'
- '4'
- '5'
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *source
to:
- '6'
- '7'
- '8'
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '9'
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
to:
- '10'
nova-cloud-controller:
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *source
to:
- '11'
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: *source
to:
- '12'
ceilometer:
num_units: 1
options:
openstack-origin: *source
to:
- '13'
gnocchi:
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *source
to:
- '14'
ceilometer-agent:
charm: cs:~openstack-charmers/ceilometer-agent
relations:
- - 'ceilometer:amqp'
- 'rabbitmq-server:amqp'
- - 'ceilometer:identity-notifications'
- 'keystone:identity-notifications'
- - 'ceilometer:ceilometer-service'
- 'ceilometer-agent:ceilometer-service'
- - 'ceilometer:metric-service'
- 'gnocchi:metric-service'
- - 'ceilometer:identity-credentials'
- 'keystone:identity-credentials'
- - 'keystone:shared-db'
- 'percona-cluster:shared-db'
- - 'ceilometer-agent:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-compute:nova-ceilometer'
- 'ceilometer-agent:nova-ceilometer'
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'
- - 'glance:identity-service'
- 'keystone:identity-service'
- - 'glance:shared-db'
- 'percona-cluster:shared-db'
- - 'glance:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-compute:image-service'
- 'glance:image-service'
- - 'nova-cloud-controller:shared-db'
- 'percona-cluster:shared-db'
- - 'nova-cloud-controller:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-cloud-controller:identity-service'
- 'keystone:identity-service'
- - 'nova-cloud-controller:cloud-compute'
- 'nova-compute:cloud-compute'
- - 'nova-cloud-controller:image-service'
- 'glance:image-service'
- - 'ceph-mon:osd'
- 'ceph-osd:mon'
- - 'gnocchi:shared-db'
- 'percona-cluster:shared-db'
- - 'gnocchi:storage-ceph'
- 'ceph-mon:client'
- - 'gnocchi:coordinator-memcached'
- 'memcached:cache'
- - 'gnocchi:identity-service'
- 'keystone:identity-service'

View File

@ -1,162 +0,0 @@
options:
source: &source cloud:bionic-train
series: bionic
machines:
0: {}
1: {}
2: {}
3: {}
4: {}
5: {}
6: {}
7: {}
8: {}
9: {}
10: {}
11: {}
12: {}
13: {}
14: {}
15: {}
applications:
percona-cluster:
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
max-connections: 1000
innodb-buffer-pool-size: 256M
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '1'
memcached:
charm: cs:~memcached-team/memcached
num_units: 1
to:
- '2'
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *source
to:
- '3'
- '4'
- '5'
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *source
to:
- '6'
- '7'
- '8'
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '9'
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
to:
- '10'
nova-cloud-controller:
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *source
to:
- '11'
placement:
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *source
to:
- '12'
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: *source
to:
- '13'
ceilometer:
num_units: 1
options:
openstack-origin: *source
to:
- '14'
gnocchi:
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *source
to:
- '15'
ceilometer-agent:
charm: cs:~openstack-charmers/ceilometer-agent
relations:
- - 'ceilometer:amqp'
- 'rabbitmq-server:amqp'
- - 'ceilometer:identity-notifications'
- 'keystone:identity-notifications'
- - 'ceilometer:ceilometer-service'
- 'ceilometer-agent:ceilometer-service'
- - 'ceilometer:metric-service'
- 'gnocchi:metric-service'
- - 'ceilometer:identity-credentials'
- 'keystone:identity-credentials'
- - 'keystone:shared-db'
- 'percona-cluster:shared-db'
- - 'ceilometer-agent:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-compute:nova-ceilometer'
- 'ceilometer-agent:nova-ceilometer'
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'
- - 'glance:identity-service'
- 'keystone:identity-service'
- - 'glance:shared-db'
- 'percona-cluster:shared-db'
- - 'glance:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-compute:image-service'
- 'glance:image-service'
- - 'nova-cloud-controller:shared-db'
- 'percona-cluster:shared-db'
- - 'nova-cloud-controller:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-cloud-controller:identity-service'
- 'keystone:identity-service'
- - 'nova-cloud-controller:cloud-compute'
- 'nova-compute:cloud-compute'
- - 'nova-cloud-controller:image-service'
- 'glance:image-service'
- - 'placement:shared-db'
- 'percona-cluster:shared-db'
- - 'placement:identity-service'
- 'keystone:identity-service'
- - 'placement:placement'
- 'nova-cloud-controller:placement'
- - 'ceph-mon:osd'
- 'ceph-osd:mon'
- - 'gnocchi:shared-db'
- 'percona-cluster:shared-db'
- - 'gnocchi:storage-ceph'
- 'ceph-mon:client'
- - 'gnocchi:coordinator-memcached'
- 'memcached:cache'
- - 'gnocchi:identity-service'
- 'keystone:identity-service'

View File

@ -1,162 +0,0 @@
options:
source: &source cloud:bionic-ussuri
series: bionic
machines:
0:
1:
2:
3:
4:
5:
6:
7:
8:
9:
10:
11:
12:
13:
14:
15:
applications:
percona-cluster:
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
max-connections: 1000
innodb-buffer-pool-size: 256M
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '1'
memcached:
charm: cs:~memcached-team/memcached
num_units: 1
to:
- '2'
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *source
to:
- '3'
- '4'
- '5'
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *source
to:
- '6'
- '7'
- '8'
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '9'
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
to:
- '10'
nova-cloud-controller:
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *source
to:
- '11'
placement:
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *source
to:
- '12'
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: *source
to:
- '13'
ceilometer:
num_units: 1
options:
openstack-origin: *source
to:
- '14'
gnocchi:
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *source
to:
- '15'
ceilometer-agent:
charm: cs:~openstack-charmers/ceilometer-agent
relations:
- - 'ceilometer:amqp'
- 'rabbitmq-server:amqp'
- - 'ceilometer:identity-notifications'
- 'keystone:identity-notifications'
- - 'ceilometer:ceilometer-service'
- 'ceilometer-agent:ceilometer-service'
- - 'ceilometer:metric-service'
- 'gnocchi:metric-service'
- - 'ceilometer:identity-credentials'
- 'keystone:identity-credentials'
- - 'keystone:shared-db'
- 'percona-cluster:shared-db'
- - 'ceilometer-agent:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-compute:nova-ceilometer'
- 'ceilometer-agent:nova-ceilometer'
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'
- - 'glance:identity-service'
- 'keystone:identity-service'
- - 'glance:shared-db'
- 'percona-cluster:shared-db'
- - 'glance:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-compute:image-service'
- 'glance:image-service'
- - 'nova-cloud-controller:shared-db'
- 'percona-cluster:shared-db'
- - 'nova-cloud-controller:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-cloud-controller:identity-service'
- 'keystone:identity-service'
- - 'nova-cloud-controller:cloud-compute'
- 'nova-compute:cloud-compute'
- - 'nova-cloud-controller:image-service'
- 'glance:image-service'
- - 'placement:shared-db'
- 'percona-cluster:shared-db'
- - 'placement:identity-service'
- 'keystone:identity-service'
- - 'placement:placement'
- 'nova-cloud-controller:placement'
- - 'ceph-mon:osd'
- 'ceph-osd:mon'
- - 'gnocchi:shared-db'
- 'percona-cluster:shared-db'
- - 'gnocchi:storage-ceph'
- 'ceph-mon:client'
- - 'gnocchi:coordinator-memcached'
- 'memcached:cache'
- - 'gnocchi:identity-service'
- 'keystone:identity-service'

View File

@ -1,238 +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':
# This machine is for memcached that isn't focal enabled.
series: bionic
'5':
'6':
'7':
'8':
'9':
'10':
'11':
'12':
'13':
'14':
'15':
'16':
'17':
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
placement-mysql-router:
charm: cs:~openstack-charmers/mysql-router
gnocchi-mysql-router:
charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
memcached:
charm: cs:~memcached-team/memcached
num_units: 1
# the memcached charm doesn't support focal yet.
series: bionic
to:
- '4'
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *openstack-origin
to:
- '5'
- '6'
- '7'
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *openstack-origin
to:
- '8'
- '9'
- '10'
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '11'
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '12'
nova-cloud-controller:
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '13'
placement:
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '14'
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '15'
ceilometer:
num_units: 1
to:
- '16'
gnocchi:
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '17'
ceilometer-agent:
charm: cs:~openstack-charmers/ceilometer-agent
relations:
- - 'ceilometer:amqp'
- 'rabbitmq-server:amqp'
- - 'ceilometer:identity-notifications'
- 'keystone:identity-notifications'
- - 'ceilometer:ceilometer-service'
- 'ceilometer-agent:ceilometer-service'
- - 'ceilometer:metric-service'
- 'gnocchi:metric-service'
- - 'ceilometer:identity-credentials'
- 'keystone:identity-credentials'
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'ceilometer-agent:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-compute:nova-ceilometer'
- 'ceilometer-agent:nova-ceilometer'
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'
- - '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-compute:image-service'
- 'glance:image-service'
- - 'nova-cloud-controller:shared-db'
- 'nova-cloud-controller-mysql-router:shared-db'
- - 'nova-cloud-controller-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'nova-cloud-controller:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-cloud-controller:identity-service'
- 'keystone:identity-service'
- - 'nova-cloud-controller:cloud-compute'
- 'nova-compute:cloud-compute'
- - 'nova-cloud-controller:image-service'
- 'glance:image-service'
- - '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'
- - 'ceph-mon:osd'
- 'ceph-osd:mon'
- - 'gnocchi:shared-db'
- 'gnocchi-mysql-router:shared-db'
- - 'gnocchi-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'gnocchi:storage-ceph'
- 'ceph-mon:client'
- - 'gnocchi:coordinator-memcached'
- 'memcached:cache'
- - 'gnocchi:identity-service'
- 'keystone:identity-service'

View File

@ -1,238 +0,0 @@
variables:
openstack-origin: &openstack-origin cloud:focal-victoria
series: focal
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
constraints: mem=3072M
'2':
constraints: mem=3072M
'3':
'4':
# This machine is for memcached that isn't focal enabled.
series: bionic
'5':
'6':
'7':
'8':
'9':
'10':
'11':
'12':
'13':
'14':
'15':
'16':
'17':
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
placement-mysql-router:
charm: cs:~openstack-charmers/mysql-router
gnocchi-mysql-router:
charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
memcached:
charm: cs:~memcached-team/memcached
num_units: 1
# the memcached charm doesn't support focal yet.
series: bionic
to:
- '4'
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *openstack-origin
to:
- '5'
- '6'
- '7'
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *openstack-origin
to:
- '8'
- '9'
- '10'
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '11'
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '12'
nova-cloud-controller:
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '13'
placement:
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '14'
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '15'
ceilometer:
num_units: 1
to:
- '16'
gnocchi:
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '17'
ceilometer-agent:
charm: cs:~openstack-charmers/ceilometer-agent
relations:
- - 'ceilometer:amqp'
- 'rabbitmq-server:amqp'
- - 'ceilometer:identity-notifications'
- 'keystone:identity-notifications'
- - 'ceilometer:ceilometer-service'
- 'ceilometer-agent:ceilometer-service'
- - 'ceilometer:metric-service'
- 'gnocchi:metric-service'
- - 'ceilometer:identity-credentials'
- 'keystone:identity-credentials'
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'ceilometer-agent:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-compute:nova-ceilometer'
- 'ceilometer-agent:nova-ceilometer'
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'
- - '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-compute:image-service'
- 'glance:image-service'
- - 'nova-cloud-controller:shared-db'
- 'nova-cloud-controller-mysql-router:shared-db'
- - 'nova-cloud-controller-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'nova-cloud-controller:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-cloud-controller:identity-service'
- 'keystone:identity-service'
- - 'nova-cloud-controller:cloud-compute'
- 'nova-compute:cloud-compute'
- - 'nova-cloud-controller:image-service'
- 'glance:image-service'
- - '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'
- - 'ceph-mon:osd'
- 'ceph-osd:mon'
- - 'gnocchi:shared-db'
- 'gnocchi-mysql-router:shared-db'
- - 'gnocchi-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'gnocchi:storage-ceph'
- 'ceph-mon:client'
- - 'gnocchi:coordinator-memcached'
- 'memcached:cache'
- - 'gnocchi:identity-service'
- 'keystone:identity-service'

View File

@ -33,18 +33,23 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
charm: ch:mysql-router
channel: 8.0.19/edge
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
charm: ch:mysql-router
channel: 8.0.19/edge
nova-cloud-controller-mysql-router:
charm: cs:~openstack-charmers/mysql-router
charm: ch:mysql-router
channel: 8.0.19/edge
placement-mysql-router:
charm: cs:~openstack-charmers/mysql-router
charm: ch:mysql-router
channel: 8.0.19/edge
gnocchi-mysql-router:
charm: cs:~openstack-charmers/mysql-router
charm: ch:mysql-router
channel: 8.0.19/edge
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@ -52,17 +57,19 @@ applications:
- '0'
- '1'
- '2'
channel: 8.0.19/edge
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
charm: ch:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
channel: 3.8/edge
memcached:
charm: cs:~memcached-team/memcached
charm: ch:memcached
num_units: 1
# the memcached charm doesn't support focal yet.
series: bionic
@ -70,7 +77,7 @@ applications:
- '4'
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
charm: ch:ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -80,9 +87,10 @@ applications:
- '5'
- '6'
- '7'
channel: pacific/edge
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
charm: ch:ceph-mon
num_units: 3
options:
source: *openstack-origin
@ -90,59 +98,67 @@ applications:
- '8'
- '9'
- '10'
channel: pacific/edge
keystone:
charm: cs:~openstack-charmers/keystone
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '11'
channel: xena/edge
glance:
charm: cs:~openstack-charmers/glance
charm: ch:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '12'
channel: xena/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:
- '13'
channel: xena/edge
placement:
charm: cs:~openstack-charmers/placement
charm: ch:placement
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '14'
channel: xena/edge
nova-compute:
charm: cs:~openstack-charmers/nova-compute
charm: ch:nova-compute
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '15'
channel: xena/edge
ceilometer:
charm: ../../ceilometer.charm
num_units: 1
to:
- '16'
gnocchi:
charm: cs:~openstack-charmers/gnocchi
charm: ch:gnocchi
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '17'
channel: xena/edge
ceilometer-agent:
charm: cs:~openstack-charmers/ceilometer-agent

View File

@ -31,18 +31,23 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
charm: ch:mysql-router
channel: 8.0.19/edge
glance-mysql-router:
charm: cs:~openstack-charmers/mysql-router
charm: ch:mysql-router
channel: 8.0.19/edge
nova-cloud-controller-mysql-router:
charm: cs:~openstack-charmers/mysql-router
charm: ch:mysql-router
channel: 8.0.19/edge
placement-mysql-router:
charm: cs:~openstack-charmers/mysql-router
charm: ch:mysql-router
channel: 8.0.19/edge
gnocchi-mysql-router:
charm: cs:~openstack-charmers/mysql-router
charm: ch:mysql-router
channel: 8.0.19/edge
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@ -50,23 +55,25 @@ applications:
- '0'
- '1'
- '2'
channel: 8.0.19/edge
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
charm: ch:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
channel: 3.8/edge
memcached:
charm: cs:~memcached-team/memcached
charm: ch:memcached
num_units: 1
to:
- '4'
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
charm: ch:ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -76,9 +83,10 @@ applications:
- '5'
- '6'
- '7'
channel: pacific/edge
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
charm: ch:ceph-mon
num_units: 3
options:
source: *openstack-origin
@ -86,59 +94,67 @@ applications:
- '8'
- '9'
- '10'
channel: pacific/edge
keystone:
charm: cs:~openstack-charmers/keystone
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '11'
channel: xena/edge
glance:
charm: cs:~openstack-charmers/glance
charm: ch:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '12'
channel: xena/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:
- '13'
channel: xena/edge
placement:
charm: cs:~openstack-charmers/placement
charm: ch:placement
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '14'
channel: xena/edge
nova-compute:
charm: cs:~openstack-charmers/nova-compute
charm: ch:nova-compute
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '15'
channel: xena/edge
ceilometer:
charm: ../../ceilometer.charm
num_units: 1
to:
- '16'
gnocchi:
charm: cs:~openstack-charmers/gnocchi
charm: ch:gnocchi
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '17'
channel: xena/edge
ceilometer-agent:
charm: cs:~openstack-charmers/ceilometer-agent

View File

@ -1,238 +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':
# This machine is for memcached that isn't focal enabled.
series: bionic
'5':
'6':
'7':
'8':
'9':
'10':
'11':
'12':
'13':
'14':
'15':
'16':
'17':
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
placement-mysql-router:
charm: cs:~openstack-charmers/mysql-router
gnocchi-mysql-router:
charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
memcached:
charm: cs:~memcached-team/memcached
num_units: 1
# the memcached charm doesn't support focal yet.
series: bionic
to:
- '4'
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *openstack-origin
to:
- '5'
- '6'
- '7'
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *openstack-origin
to:
- '8'
- '9'
- '10'
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '11'
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '12'
nova-cloud-controller:
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '13'
placement:
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '14'
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '15'
ceilometer:
num_units: 1
to:
- '16'
gnocchi:
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '17'
ceilometer-agent:
charm: cs:~openstack-charmers/ceilometer-agent
relations:
- - 'ceilometer:amqp'
- 'rabbitmq-server:amqp'
- - 'ceilometer:identity-notifications'
- 'keystone:identity-notifications'
- - 'ceilometer:ceilometer-service'
- 'ceilometer-agent:ceilometer-service'
- - 'ceilometer:metric-service'
- 'gnocchi:metric-service'
- - 'ceilometer:identity-credentials'
- 'keystone:identity-credentials'
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'ceilometer-agent:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-compute:nova-ceilometer'
- 'ceilometer-agent:nova-ceilometer'
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'
- - '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-compute:image-service'
- 'glance:image-service'
- - 'nova-cloud-controller:shared-db'
- 'nova-cloud-controller-mysql-router:shared-db'
- - 'nova-cloud-controller-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'nova-cloud-controller:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-cloud-controller:identity-service'
- 'keystone:identity-service'
- - 'nova-cloud-controller:cloud-compute'
- 'nova-compute:cloud-compute'
- - 'nova-cloud-controller:image-service'
- 'glance:image-service'
- - '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'
- - 'ceph-mon:osd'
- 'ceph-osd:mon'
- - 'gnocchi:shared-db'
- 'gnocchi-mysql-router:shared-db'
- - 'gnocchi-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'gnocchi:storage-ceph'
- 'ceph-mon:client'
- - 'gnocchi:coordinator-memcached'
- 'memcached:cache'
- - 'gnocchi:identity-service'
- 'keystone:identity-service'

View File

@ -1,238 +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':
# This machine is for memcached that isn't focal enabled.
series: bionic
'5':
'6':
'7':
'8':
'9':
'10':
'11':
'12':
'13':
'14':
'15':
'16':
'17':
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
placement-mysql-router:
charm: cs:~openstack-charmers/mysql-router
gnocchi-mysql-router:
charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
memcached:
charm: cs:~memcached-team/memcached
num_units: 1
# the memcached charm doesn't support focal yet.
series: bionic
to:
- '4'
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *openstack-origin
to:
- '5'
- '6'
- '7'
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *openstack-origin
to:
- '8'
- '9'
- '10'
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '11'
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '12'
nova-cloud-controller:
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '13'
placement:
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '14'
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '15'
ceilometer:
num_units: 1
to:
- '16'
gnocchi:
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '17'
ceilometer-agent:
charm: cs:~openstack-charmers/ceilometer-agent
relations:
- - 'ceilometer:amqp'
- 'rabbitmq-server:amqp'
- - 'ceilometer:identity-notifications'
- 'keystone:identity-notifications'
- - 'ceilometer:ceilometer-service'
- 'ceilometer-agent:ceilometer-service'
- - 'ceilometer:metric-service'
- 'gnocchi:metric-service'
- - 'ceilometer:identity-credentials'
- 'keystone:identity-credentials'
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'ceilometer-agent:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-compute:nova-ceilometer'
- 'ceilometer-agent:nova-ceilometer'
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'
- - '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-compute:image-service'
- 'glance:image-service'
- - 'nova-cloud-controller:shared-db'
- 'nova-cloud-controller-mysql-router:shared-db'
- - 'nova-cloud-controller-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'nova-cloud-controller:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-cloud-controller:identity-service'
- 'keystone:identity-service'
- - 'nova-cloud-controller:cloud-compute'
- 'nova-compute:cloud-compute'
- - 'nova-cloud-controller:image-service'
- 'glance:image-service'
- - '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'
- - 'ceph-mon:osd'
- 'ceph-osd:mon'
- - 'gnocchi:shared-db'
- 'gnocchi-mysql-router:shared-db'
- - 'gnocchi-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'gnocchi:storage-ceph'
- 'ceph-mon:client'
- - 'gnocchi:coordinator-memcached'
- 'memcached:cache'
- - 'gnocchi:identity-service'
- 'keystone:identity-service'

View File

@ -1,238 +0,0 @@
variables:
openstack-origin: &openstack-origin distro
series: impish
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':
# This machine is for memcached that isn't focal enabled.
series: bionic
'5':
'6':
'7':
'8':
'9':
'10':
'11':
'12':
'13':
'14':
'15':
'16':
'17':
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
placement-mysql-router:
charm: cs:~openstack-charmers/mysql-router
gnocchi-mysql-router:
charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
memcached:
charm: cs:~memcached-team/memcached
num_units: 1
# the memcached charm doesn't support focal yet.
series: bionic
to:
- '4'
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *openstack-origin
to:
- '5'
- '6'
- '7'
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *openstack-origin
to:
- '8'
- '9'
- '10'
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '11'
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '12'
nova-cloud-controller:
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '13'
placement:
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '14'
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '15'
ceilometer:
num_units: 1
to:
- '16'
gnocchi:
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '17'
ceilometer-agent:
charm: cs:~openstack-charmers/ceilometer-agent
relations:
- - 'ceilometer:amqp'
- 'rabbitmq-server:amqp'
- - 'ceilometer:identity-notifications'
- 'keystone:identity-notifications'
- - 'ceilometer:ceilometer-service'
- 'ceilometer-agent:ceilometer-service'
- - 'ceilometer:metric-service'
- 'gnocchi:metric-service'
- - 'ceilometer:identity-credentials'
- 'keystone:identity-credentials'
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'ceilometer-agent:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-compute:nova-ceilometer'
- 'ceilometer-agent:nova-ceilometer'
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'
- - '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-compute:image-service'
- 'glance:image-service'
- - 'nova-cloud-controller:shared-db'
- 'nova-cloud-controller-mysql-router:shared-db'
- - 'nova-cloud-controller-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'nova-cloud-controller:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-cloud-controller:identity-service'
- 'keystone:identity-service'
- - 'nova-cloud-controller:cloud-compute'
- 'nova-compute:cloud-compute'
- - 'nova-cloud-controller:image-service'
- 'glance:image-service'
- - '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'
- - 'ceph-mon:osd'
- 'ceph-osd:mon'
- - 'gnocchi:shared-db'
- 'gnocchi-mysql-router:shared-db'
- - 'gnocchi-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'gnocchi:storage-ceph'
- 'ceph-mon:client'
- - 'gnocchi:coordinator-memcached'
- 'memcached:cache'
- - 'gnocchi:identity-service'
- 'keystone:identity-service'

View File

@ -1,101 +0,0 @@
options:
source: &source cloud:trusty-mitaka
series: trusty
machines:
0: {}
1: {}
2: {}
3: {}
4: {}
5: {}
6: {}
7: {}
applications:
percona-cluster:
charm: cs:trusty/percona-cluster
num_units: 1
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '1'
mongodb:
charm: cs:trusty/mongodb-53
num_units: 1
to:
- '2'
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '3'
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
to:
- '4'
nova-cloud-controller:
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *source
to:
- '5'
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: *source
to:
- '6'
ceilometer:
num_units: 1
options:
openstack-origin: *source
to:
- '7'
ceilometer-agent:
charm: cs:~openstack-charmers/ceilometer-agent
relations:
- - 'ceilometer:amqp'
- 'rabbitmq-server:amqp'
- - 'ceilometer:identity-notifications'
- 'keystone:identity-notifications'
- - 'ceilometer:ceilometer-service'
- 'ceilometer-agent:ceilometer-service'
- - 'ceilometer:identity-service'
- 'keystone:identity-service'
- - 'ceilometer:shared-db'
- 'mongodb:database'
- - 'keystone:shared-db'
- 'percona-cluster:shared-db'
- - 'ceilometer-agent:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-compute:nova-ceilometer'
- 'ceilometer-agent:nova-ceilometer'
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'
- - 'glance:identity-service'
- 'keystone:identity-service'
- - 'glance:shared-db'
- 'percona-cluster:shared-db'
- - 'glance:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-compute:image-service'
- 'glance:image-service'
- - 'nova-cloud-controller:shared-db'
- 'percona-cluster:shared-db'
- - 'nova-cloud-controller:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-cloud-controller:identity-service'
- 'keystone:identity-service'
- - 'nova-cloud-controller:cloud-compute'
- 'nova-compute:cloud-compute'
- - 'nova-cloud-controller:image-service'
- 'glance:image-service'

View File

@ -1,89 +0,0 @@
series: xenial
machines:
0: {}
1: {}
2: {}
3: {}
4: {}
5: {}
6: {}
7: {}
applications:
percona-cluster:
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '1'
mongodb:
charm: cs:xenial/mongodb
num_units: 1
to:
- '2'
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
to:
- '3'
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
to:
- '4'
nova-cloud-controller:
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
to:
- '5'
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 1
to:
- '6'
ceilometer:
num_units: 1
to:
- '7'
ceilometer-agent:
charm: cs:~openstack-charmers/ceilometer-agent
relations:
- - 'ceilometer:amqp'
- 'rabbitmq-server:amqp'
- - 'ceilometer:identity-notifications'
- 'keystone:identity-notifications'
- - 'ceilometer:ceilometer-service'
- 'ceilometer-agent:ceilometer-service'
- - 'ceilometer:identity-service'
- 'keystone:identity-service'
- - 'ceilometer:shared-db'
- 'mongodb:database'
- - 'keystone:shared-db'
- 'percona-cluster:shared-db'
- - 'ceilometer-agent:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-compute:nova-ceilometer'
- 'ceilometer-agent:nova-ceilometer'
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'
- - 'glance:identity-service'
- 'keystone:identity-service'
- - 'glance:shared-db'
- 'percona-cluster:shared-db'
- - 'glance:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-compute:image-service'
- 'glance:image-service'
- - 'nova-cloud-controller:shared-db'
- 'percona-cluster:shared-db'
- - 'nova-cloud-controller:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-cloud-controller:identity-service'
- 'keystone:identity-service'
- - 'nova-cloud-controller:cloud-compute'
- 'nova-compute:cloud-compute'
- - 'nova-cloud-controller:image-service'
- 'glance:image-service'

View File

@ -1,156 +0,0 @@
options:
source: &source cloud:xenial-ocata
series: xenial
machines:
0: {}
1: {}
2: {}
3: {}
4: {}
5: {}
6: {}
7: {}
8: {}
9: {}
10: {}
11: {}
12: {}
13: {}
14: {}
15: {}
applications:
percona-cluster:
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
max-connections: 1000
innodb-buffer-pool-size: 256M
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '1'
memcached:
charm: cs:~memcached-team/memcached
num_units: 1
to:
- '2'
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *source
to:
- '3'
- '4'
- '5'
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *source
to:
- '6'
- '7'
- '8'
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '9'
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
to:
- '10'
nova-cloud-controller:
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *source
to:
- '11'
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: *source
to:
- '12'
ceilometer:
num_units: 1
options:
openstack-origin: *source
to:
- '13'
gnocchi:
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *source
to:
- '14'
ceilometer-agent:
charm: cs:~openstack-charmers/ceilometer-agent
mongodb:
num_units: 1
charm: cs:xenial/mongodb
to:
- '15'
relations:
- - 'ceilometer:amqp'
- 'rabbitmq-server:amqp'
- - 'ceilometer:identity-notifications'
- 'keystone:identity-notifications'
- - 'ceilometer:ceilometer-service'
- 'ceilometer-agent:ceilometer-service'
- - 'ceilometer:metric-service'
- 'gnocchi:metric-service'
- - 'ceilometer:identity-service'
- 'keystone:identity-service'
- - 'ceilometer:shared-db'
- 'mongodb:database'
- - 'keystone:shared-db'
- 'percona-cluster:shared-db'
- - 'ceilometer-agent:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-compute:nova-ceilometer'
- 'ceilometer-agent:nova-ceilometer'
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'
- - 'glance:identity-service'
- 'keystone:identity-service'
- - 'glance:shared-db'
- 'percona-cluster:shared-db'
- - 'glance:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-compute:image-service'
- 'glance:image-service'
- - 'nova-cloud-controller:shared-db'
- 'percona-cluster:shared-db'
- - 'nova-cloud-controller:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-cloud-controller:identity-service'
- 'keystone:identity-service'
- - 'nova-cloud-controller:cloud-compute'
- 'nova-compute:cloud-compute'
- - 'nova-cloud-controller:image-service'
- 'glance:image-service'
- - 'ceph-mon:osd'
- 'ceph-osd:mon'
- - 'gnocchi:shared-db'
- 'percona-cluster:shared-db'
- - 'gnocchi:storage-ceph'
- 'ceph-mon:client'
- - 'gnocchi:coordinator-memcached'
- 'memcached:cache'
- - 'gnocchi:identity-service'
- 'keystone:identity-service'

View File

@ -1,148 +0,0 @@
options:
source: &source cloud:xenial-pike
series: xenial
machines:
0: {}
1: {}
2: {}
3: {}
4: {}
5: {}
6: {}
7: {}
8: {}
9: {}
10: {}
11: {}
12: {}
13: {}
14: {}
applications:
percona-cluster:
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
max-connections: 1000
innodb-buffer-pool-size: 256M
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '1'
memcached:
charm: cs:~memcached-team/memcached
num_units: 1
to:
- '2'
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *source
to:
- '3'
- '4'
- '5'
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *source
to:
- '6'
- '7'
- '8'
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '9'
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
to:
- '10'
nova-cloud-controller:
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *source
to:
- '11'
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: *source
to:
- '12'
ceilometer:
num_units: 1
options:
openstack-origin: *source
to:
- '13'
gnocchi:
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *source
to:
- '14'
ceilometer-agent:
charm: cs:~openstack-charmers/ceilometer-agent
relations:
- - 'ceilometer:amqp'
- 'rabbitmq-server:amqp'
- - 'ceilometer:identity-notifications'
- 'keystone:identity-notifications'
- - 'ceilometer:ceilometer-service'
- 'ceilometer-agent:ceilometer-service'
- - 'ceilometer:metric-service'
- 'gnocchi:metric-service'
- - 'ceilometer:identity-service'
- 'keystone:identity-service'
- - 'keystone:shared-db'
- 'percona-cluster:shared-db'
- - 'ceilometer-agent:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-compute:nova-ceilometer'
- 'ceilometer-agent:nova-ceilometer'
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'
- - 'glance:identity-service'
- 'keystone:identity-service'
- - 'glance:shared-db'
- 'percona-cluster:shared-db'
- - 'glance:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-compute:image-service'
- 'glance:image-service'
- - 'nova-cloud-controller:shared-db'
- 'percona-cluster:shared-db'
- - 'nova-cloud-controller:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-cloud-controller:identity-service'
- 'keystone:identity-service'
- - 'nova-cloud-controller:cloud-compute'
- 'nova-compute:cloud-compute'
- - 'nova-cloud-controller:image-service'
- 'glance:image-service'
- - 'ceph-mon:osd'
- 'ceph-osd:mon'
- - 'gnocchi:shared-db'
- 'percona-cluster:shared-db'
- - 'gnocchi:storage-ceph'
- 'ceph-mon:client'
- - 'gnocchi:coordinator-memcached'
- 'memcached:cache'
- - 'gnocchi:identity-service'
- 'keystone:identity-service'

View File

@ -1,148 +0,0 @@
options:
source: &source cloud:xenial-queens
series: xenial
machines:
0: {}
1: {}
2: {}
3: {}
4: {}
5: {}
6: {}
7: {}
8: {}
9: {}
10: {}
11: {}
12: {}
13: {}
14: {}
applications:
percona-cluster:
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
max-connections: 1000
innodb-buffer-pool-size: 256M
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '1'
memcached:
charm: cs:~memcached-team/memcached
num_units: 1
to:
- '2'
ceph-osd:
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *source
to:
- '3'
- '4'
- '5'
ceph-mon:
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *source
to:
- '6'
- '7'
- '8'
keystone:
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '9'
glance:
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
to:
- '10'
nova-cloud-controller:
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *source
to:
- '11'
nova-compute:
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: *source
to:
- '12'
ceilometer:
num_units: 1
options:
openstack-origin: *source
to:
- '13'
gnocchi:
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *source
to:
- '14'
ceilometer-agent:
charm: cs:~openstack-charmers/ceilometer-agent
relations:
- - 'ceilometer:amqp'
- 'rabbitmq-server:amqp'
- - 'ceilometer:identity-notifications'
- 'keystone:identity-notifications'
- - 'ceilometer:ceilometer-service'
- 'ceilometer-agent:ceilometer-service'
- - 'ceilometer:metric-service'
- 'gnocchi:metric-service'
- - 'ceilometer:identity-credentials'
- 'keystone:identity-credentials'
- - 'keystone:shared-db'
- 'percona-cluster:shared-db'
- - 'ceilometer-agent:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-compute:nova-ceilometer'
- 'ceilometer-agent:nova-ceilometer'
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'
- - 'glance:identity-service'
- 'keystone:identity-service'
- - 'glance:shared-db'
- 'percona-cluster:shared-db'
- - 'glance:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-compute:image-service'
- 'glance:image-service'
- - 'nova-cloud-controller:shared-db'
- 'percona-cluster:shared-db'
- - 'nova-cloud-controller:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-cloud-controller:identity-service'
- 'keystone:identity-service'
- - 'nova-cloud-controller:cloud-compute'
- 'nova-compute:cloud-compute'
- - 'nova-cloud-controller:image-service'
- 'glance:image-service'
- - 'ceph-mon:osd'
- 'ceph-osd:mon'
- - 'gnocchi:shared-db'
- 'percona-cluster:shared-db'
- - 'gnocchi:storage-ceph'
- 'ceph-mon:client'
- - 'gnocchi:coordinator-memcached'
- 'memcached:cache'
- - 'gnocchi:identity-service'
- 'keystone:identity-service'

View File

@ -4,28 +4,12 @@ configure:
- zaza.openstack.charm_tests.ceilometer.setup.basic_setup
gate_bundles:
- xenial-mitaka
- bionic-queens
- bionic-stein
- bionic-train
- bionic-ussuri
- focal-ussuri
- focal-victoria
- focal-wallaby
- focal-xena
- groovy-victoria
dev_bundles:
- trusty-mitaka
- xenial-ocata
- xenial-pike
- xenial-queens
- bionic-rocky
- hirsute-wallaby
- impish-xena
dev_bundles: []
smoke_bundles:
- bionic-stein
smoke_bundles: []
tests:
- zaza.openstack.charm_tests.ceilometer.tests.CeilometerTest
@ -33,11 +17,7 @@ tests:
target_deploy_status:
ceilometer:
workload-status: blocked
workload-status-message: "Run the ceilometer-upgrade action on the leader to initialize ceilometer and gnocchi"
workload-status-message-prefix: "Run the ceilometer-upgrade action on the leader to initialize ceilometer and gnocchi"
tests_options:
force_deploy:
- trusty-mitaka
- groovy-victoria
- hirsute-wallaby
- impish-xena
force_deploy: []

17
tox.ini
View File

@ -37,10 +37,20 @@ 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:build]
basepython = python3
deps = -r{toxinidir}/build-requirements.txt
commands =
charmcraft clean
charmcraft -v build
{toxinidir}/rename.sh
[testenv:py35]
basepython = python3.5
deps = -r{toxinidir}/requirements.txt
@ -61,6 +71,11 @@ basepython = python3.8
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
[testenv:py39]
basepython = python3.9
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
[testenv:py3]
basepython = python3
deps = -r{toxinidir}/requirements.txt

View File

@ -113,24 +113,11 @@ class CeilometerHooksTest(CharmTestCase):
@patch('charmhelpers.payload.execd.default_execd_dir',
return_value=os.path.join(os.getcwd(), 'exec.d'))
@patch('charmhelpers.core.hookenv.config')
def test_install_hook_precise(self, mock_config, mock_execd_dir):
hooks.hooks.execute(['hooks/install.real'])
self.configure_installation_source.\
assert_called_with('cloud:precise-grizzly')
self.apt_update.assert_called_with(fatal=True)
self.apt_install.assert_called_with(
ceilometer_utils.CEILOMETER_BASE_PACKAGES,
fatal=True
)
@patch('charmhelpers.payload.execd.default_execd_dir',
return_value=os.path.join(os.getcwd(), 'exec.d'))
@patch('charmhelpers.core.hookenv.config')
def test_install_hook_distro(self, mock_config, mock_execd_dir):
def test_install_hook_default(self, mock_config, mock_execd_dir):
self.lsb_release.return_value = {'DISTRIB_CODENAME': 'saucy'}
hooks.hooks.execute(['hooks/install.real'])
self.configure_installation_source.\
assert_called_with('distro')
assert_called_with('cloud:focal-xena')
self.apt_update.assert_called_with(fatal=True)
self.apt_install.assert_called_with(
ceilometer_utils.CEILOMETER_BASE_PACKAGES,