Update to build using charmcraft - focal batch
The 'focal' batch includes charms that are distro based, rather than OpenStack release based. This charm contains support for bionic as well. Change-Id: I4cad189a2ce1ea30014e5fff72cb664e4c9d68de
This commit is contained in:
Alex Kavanagh
parent
b3adbfd392
commit
b3f22f3387
|
|
@ -11,3 +11,4 @@ __pycache__/
|
|||
.pydevproject
|
||||
.stestr
|
||||
.unit-state.db
|
||||
*.charm
|
||||
|
|
|
|||
|
|
@ -3,4 +3,4 @@ host=review.opendev.org
|
|||
port=29418
|
||||
project=openstack/charm-rabbitmq-server.git
|
||||
|
||||
defaultbranch=stable/21.10
|
||||
defaultbranch=stable/focal
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
@ -0,0 +1,46 @@
|
|||
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
|
||||
- name: ubuntu
|
||||
channel: "18.04"
|
||||
architectures:
|
||||
- amd64
|
||||
- s390x
|
||||
- ppc64el
|
||||
- arm64
|
||||
run-on:
|
||||
- name: ubuntu
|
||||
channel: "18.04"
|
||||
- name: ubuntu
|
||||
channel: "20.04"
|
||||
- name: ubuntu
|
||||
channel: "21.10"
|
||||
59
osci.yaml
59
osci.yaml
|
|
@ -1,57 +1,12 @@
|
|||
- project:
|
||||
templates:
|
||||
- charm-unit-jobs
|
||||
- charm-unit-jobs-py36
|
||||
- charm-unit-jobs-py38
|
||||
check:
|
||||
jobs:
|
||||
- rabbit-xenial
|
||||
- rabbit-bionic
|
||||
- rabbit-focal
|
||||
- rabbit-groovy
|
||||
- rabbit-hirsute
|
||||
- rabbit-impish:
|
||||
voting: false
|
||||
- bionic
|
||||
- focal
|
||||
vars:
|
||||
needs_charm_build: false
|
||||
|
||||
- job:
|
||||
name: rabbit-xenial
|
||||
parent: func-target
|
||||
dependencies: &smoke-jobs
|
||||
- rabbit-focal
|
||||
vars:
|
||||
tox_extra_args: xenial-mitaka
|
||||
- job:
|
||||
name: rabbit-bionic
|
||||
parent: func-target
|
||||
dependencies: *smoke-jobs
|
||||
vars:
|
||||
tox_extra_args: bionic-queens
|
||||
- job:
|
||||
name: rabbit-focal
|
||||
parent: func-target
|
||||
dependencies: &lint-jobs
|
||||
- osci-lint
|
||||
- tox-py35
|
||||
- tox-py36
|
||||
- tox-py37
|
||||
- tox-py38
|
||||
vars:
|
||||
tox_extra_args: focal-ussuri
|
||||
- job:
|
||||
name: rabbit-groovy
|
||||
parent: func-target
|
||||
dependencies: *smoke-jobs
|
||||
vars:
|
||||
tox_extra_args: groovy-victoria
|
||||
- job:
|
||||
name: rabbit-hirsute
|
||||
parent: func-target
|
||||
dependencies: *smoke-jobs
|
||||
vars:
|
||||
tox_extra_args: hirsute-wallaby
|
||||
- job:
|
||||
name: rabbit-impish
|
||||
parent: func-target
|
||||
dependencies: *smoke-jobs
|
||||
vars:
|
||||
tox_extra_args: impish-xena
|
||||
needs_charm_build: true
|
||||
charm_build_name: rabbitmq-server
|
||||
build_type: charmcraft
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
#!/bin/bash
|
||||
charm=$(grep "charm_build_name" osci.yaml | awk '{print $2}')
|
||||
echo "renaming ${charm}_*.charm to ${charm}.charm"
|
||||
echo -n "pwd: "
|
||||
pwd
|
||||
ls -al
|
||||
echo "Removing bad downloaded charm maybe?"
|
||||
if [[ -e "${charm}.charm" ]];
|
||||
then
|
||||
rm "${charm}.charm"
|
||||
fi
|
||||
echo "Renaming charm here."
|
||||
mv ${charm}_*.charm ${charm}.charm
|
||||
|
|
@ -7,6 +7,7 @@
|
|||
# requirements. They are intertwined. Also, Zaza itself should specify
|
||||
# all of its own requirements and if it doesn't, fix it there.
|
||||
#
|
||||
pyparsing<3.0.0 # aodhclient is pinned in zaza and needs pyparsing < 3.0.0, but cffi also needs it, so pin here.
|
||||
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
|
||||
|
||||
|
|
|
|||
|
|
@ -1,53 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin cloud:bionic-rocky
|
||||
|
||||
series: bionic
|
||||
|
||||
relations:
|
||||
- - cinder:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - cinder:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - cinder:identity-service
|
||||
- keystone:identity-service
|
||||
- - keystone:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - nrpe:nrpe-external-master
|
||||
- rabbitmq-server:nrpe-external-master
|
||||
- - nrpe:monitors
|
||||
- nagios:monitors
|
||||
|
||||
applications:
|
||||
rabbitmq-server:
|
||||
charm: "../../../rabbitmq-server"
|
||||
num_units: 3
|
||||
constraints:
|
||||
cpu-cores=2
|
||||
options:
|
||||
min-cluster-size: 3
|
||||
max-cluster-tries: 6
|
||||
ssl: "off"
|
||||
management_plugin: "False"
|
||||
stats_cron_schedule: "*/1 * * * *"
|
||||
cinder:
|
||||
charm: cs:~openstack-charmers/cinder
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
max-connections: 1000
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
admin-password: openstack
|
||||
nagios:
|
||||
charm: cs:nagios
|
||||
num_units: 1
|
||||
nrpe:
|
||||
charm: cs:nrpe
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin cloud:bionic-stein
|
||||
|
||||
series: bionic
|
||||
|
||||
relations:
|
||||
- - cinder:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - cinder:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - cinder:identity-service
|
||||
- keystone:identity-service
|
||||
- - keystone:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - nrpe:nrpe-external-master
|
||||
- rabbitmq-server:nrpe-external-master
|
||||
- - nrpe:monitors
|
||||
- nagios:monitors
|
||||
|
||||
applications:
|
||||
rabbitmq-server:
|
||||
charm: "../../../rabbitmq-server"
|
||||
num_units: 3
|
||||
constraints:
|
||||
cpu-cores=2
|
||||
options:
|
||||
min-cluster-size: 3
|
||||
max-cluster-tries: 6
|
||||
ssl: "off"
|
||||
management_plugin: "False"
|
||||
stats_cron_schedule: "*/1 * * * *"
|
||||
cinder:
|
||||
charm: cs:~openstack-charmers/cinder
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
max-connections: 1000
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
admin-password: openstack
|
||||
nagios:
|
||||
charm: cs:nagios
|
||||
num_units: 1
|
||||
nrpe:
|
||||
charm: cs:nrpe
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin cloud:bionic-train
|
||||
|
||||
series: bionic
|
||||
|
||||
relations:
|
||||
- - cinder:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - cinder:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - cinder:identity-service
|
||||
- keystone:identity-service
|
||||
- - keystone:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - nrpe:nrpe-external-master
|
||||
- rabbitmq-server:nrpe-external-master
|
||||
- - nrpe:monitors
|
||||
- nagios:monitors
|
||||
|
||||
applications:
|
||||
rabbitmq-server:
|
||||
charm: "../../../rabbitmq-server"
|
||||
num_units: 3
|
||||
constraints:
|
||||
cpu-cores=2
|
||||
options:
|
||||
min-cluster-size: 3
|
||||
max-cluster-tries: 6
|
||||
ssl: "off"
|
||||
management_plugin: "False"
|
||||
stats_cron_schedule: "*/1 * * * *"
|
||||
cinder:
|
||||
charm: cs:~openstack-charmers/cinder
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
max-connections: 1000
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
admin-password: openstack
|
||||
nagios:
|
||||
charm: cs:nagios
|
||||
num_units: 1
|
||||
nrpe:
|
||||
charm: cs:nrpe
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin cloud:bionic-ussuri
|
||||
|
||||
series: bionic
|
||||
|
||||
relations:
|
||||
- - cinder:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - cinder:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - cinder:identity-service
|
||||
- keystone:identity-service
|
||||
- - keystone:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - nrpe:nrpe-external-master
|
||||
- rabbitmq-server:nrpe-external-master
|
||||
- - nrpe:monitors
|
||||
- nagios:monitors
|
||||
|
||||
applications:
|
||||
rabbitmq-server:
|
||||
charm: "../../../rabbitmq-server"
|
||||
num_units: 3
|
||||
constraints:
|
||||
cpu-cores=2
|
||||
options:
|
||||
min-cluster-size: 3
|
||||
max-cluster-tries: 6
|
||||
ssl: "off"
|
||||
management_plugin: "False"
|
||||
stats_cron_schedule: "*/1 * * * *"
|
||||
cinder:
|
||||
charm: cs:~openstack-charmers/cinder
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
max-connections: 1000
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
admin-password: openstack
|
||||
nagios:
|
||||
charm: cs:nagios
|
||||
num_units: 1
|
||||
nrpe:
|
||||
charm: cs:nrpe
|
||||
|
|
@ -1,3 +1,5 @@
|
|||
local_overlay_enabled: true
|
||||
|
||||
series: bionic
|
||||
|
||||
relations:
|
||||
|
|
@ -16,7 +18,7 @@ relations:
|
|||
|
||||
applications:
|
||||
rabbitmq-server:
|
||||
charm: "../../../rabbitmq-server"
|
||||
charm: ../../rabbitmq-server.charm
|
||||
num_units: 3
|
||||
constraints:
|
||||
cpu-cores=2
|
||||
|
|
@ -26,21 +28,29 @@ applications:
|
|||
ssl: "off"
|
||||
management_plugin: "False"
|
||||
stats_cron_schedule: "*/1 * * * *"
|
||||
|
||||
cinder:
|
||||
charm: cs:~openstack-charmers/cinder
|
||||
charm: ch:cinder
|
||||
num_units: 1
|
||||
channel: queens/edge
|
||||
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
charm: ch:percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
max-connections: 1000
|
||||
channel: 5.7/edge
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
charm: ch:keystone
|
||||
num_units: 1
|
||||
options:
|
||||
admin-password: openstack
|
||||
channel: queens/edge
|
||||
|
||||
nagios:
|
||||
charm: cs:nagios
|
||||
num_units: 1
|
||||
|
||||
nrpe:
|
||||
charm: cs:nrpe
|
||||
|
|
@ -1,102 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin cloud:focal-victoria
|
||||
|
||||
series: focal
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
machines:
|
||||
'0':
|
||||
constraints: mem=3072M
|
||||
'1':
|
||||
constraints: mem=3072M
|
||||
'2':
|
||||
constraints: mem=3072M
|
||||
'3':
|
||||
'4':
|
||||
'5':
|
||||
'6':
|
||||
'7':
|
||||
'8':
|
||||
series: bionic # nagios not supported on focal yet
|
||||
|
||||
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
cinder-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: "../../../rabbitmq-server"
|
||||
num_units: 3
|
||||
constraints:
|
||||
cpu-cores=2
|
||||
options:
|
||||
min-cluster-size: 3
|
||||
max-cluster-tries: 6
|
||||
ssl: "off"
|
||||
management_plugin: "False"
|
||||
stats_cron_schedule: "*/1 * * * *"
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
- '4'
|
||||
- '5'
|
||||
|
||||
cinder:
|
||||
charm: cs:~openstack-charmers/cinder
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '6'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
admin-password: openstack
|
||||
to:
|
||||
- '7'
|
||||
|
||||
nagios:
|
||||
charm: cs:nagios
|
||||
series: bionic # not supported on focal yet
|
||||
num_units: 1
|
||||
to:
|
||||
- '8'
|
||||
|
||||
nrpe:
|
||||
charm: cs:nrpe
|
||||
|
||||
relations:
|
||||
|
||||
- - 'cinder:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
- - 'cinder:shared-db'
|
||||
- 'cinder-mysql-router:shared-db'
|
||||
- - 'cinder-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
- - 'cinder:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
- - 'keystone:shared-db'
|
||||
- 'keystone-mysql-router:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
- - 'nrpe:nrpe-external-master'
|
||||
- 'rabbitmq-server:nrpe-external-master'
|
||||
- - 'nrpe:monitors'
|
||||
- 'nagios:monitors'
|
||||
|
|
@ -1,102 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin cloud:focal-wallaby
|
||||
|
||||
series: focal
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
machines:
|
||||
'0':
|
||||
constraints: mem=3072M
|
||||
'1':
|
||||
constraints: mem=3072M
|
||||
'2':
|
||||
constraints: mem=3072M
|
||||
'3':
|
||||
'4':
|
||||
'5':
|
||||
'6':
|
||||
'7':
|
||||
'8':
|
||||
series: bionic # nagios not supported on focal yet
|
||||
|
||||
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
cinder-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: "../../../rabbitmq-server"
|
||||
num_units: 3
|
||||
constraints:
|
||||
cpu-cores=2
|
||||
options:
|
||||
min-cluster-size: 3
|
||||
max-cluster-tries: 6
|
||||
ssl: "off"
|
||||
management_plugin: "False"
|
||||
stats_cron_schedule: "*/1 * * * *"
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
- '4'
|
||||
- '5'
|
||||
|
||||
cinder:
|
||||
charm: cs:~openstack-charmers/cinder
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '6'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
admin-password: openstack
|
||||
to:
|
||||
- '7'
|
||||
|
||||
nagios:
|
||||
charm: cs:nagios
|
||||
series: bionic # not supported on focal yet
|
||||
num_units: 1
|
||||
to:
|
||||
- '8'
|
||||
|
||||
nrpe:
|
||||
charm: cs:nrpe
|
||||
|
||||
relations:
|
||||
|
||||
- - 'cinder:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
- - 'cinder:shared-db'
|
||||
- 'cinder-mysql-router:shared-db'
|
||||
- - 'cinder-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
- - 'cinder:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
- - 'keystone:shared-db'
|
||||
- 'keystone-mysql-router:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
- - 'nrpe:nrpe-external-master'
|
||||
- 'rabbitmq-server:nrpe-external-master'
|
||||
- - 'nrpe:monitors'
|
||||
- 'nagios:monitors'
|
||||
|
|
@ -1,102 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin cloud:focal-xena
|
||||
|
||||
series: focal
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
machines:
|
||||
'0':
|
||||
constraints: mem=3072M
|
||||
'1':
|
||||
constraints: mem=3072M
|
||||
'2':
|
||||
constraints: mem=3072M
|
||||
'3':
|
||||
'4':
|
||||
'5':
|
||||
'6':
|
||||
'7':
|
||||
'8':
|
||||
series: bionic # nagios not supported on focal yet
|
||||
|
||||
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
cinder-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: "../../../rabbitmq-server"
|
||||
num_units: 3
|
||||
constraints:
|
||||
cpu-cores=2
|
||||
options:
|
||||
min-cluster-size: 3
|
||||
max-cluster-tries: 6
|
||||
ssl: "off"
|
||||
management_plugin: "False"
|
||||
stats_cron_schedule: "*/1 * * * *"
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
- '4'
|
||||
- '5'
|
||||
|
||||
cinder:
|
||||
charm: cs:~openstack-charmers/cinder
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '6'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
admin-password: openstack
|
||||
to:
|
||||
- '7'
|
||||
|
||||
nagios:
|
||||
charm: cs:nagios
|
||||
series: bionic # not supported on focal yet
|
||||
num_units: 1
|
||||
to:
|
||||
- '8'
|
||||
|
||||
nrpe:
|
||||
charm: cs:nrpe
|
||||
|
||||
relations:
|
||||
|
||||
- - 'cinder:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
- - 'cinder:shared-db'
|
||||
- 'cinder-mysql-router:shared-db'
|
||||
- - 'cinder-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
- - 'cinder:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
- - 'keystone:shared-db'
|
||||
- 'keystone-mysql-router:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
- - 'nrpe:nrpe-external-master'
|
||||
- 'rabbitmq-server:nrpe-external-master'
|
||||
- - 'nrpe:monitors'
|
||||
- 'nagios:monitors'
|
||||
|
|
@ -1,3 +1,5 @@
|
|||
local_overlay_enabled: true
|
||||
|
||||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
|
|
@ -24,12 +26,14 @@ machines:
|
|||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
charm: ch:mysql-router
|
||||
channel: 8.0.19/edge
|
||||
cinder-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
|
||||
|
|
@ -37,9 +41,10 @@ applications:
|
|||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
channel: 8.0.19/edge
|
||||
|
||||
rabbitmq-server:
|
||||
charm: "../../../rabbitmq-server"
|
||||
charm: ../../rabbitmq-server.charm
|
||||
num_units: 3
|
||||
constraints:
|
||||
cpu-cores=2
|
||||
|
|
@ -56,25 +61,27 @@ applications:
|
|||
- '5'
|
||||
|
||||
cinder:
|
||||
charm: cs:~openstack-charmers/cinder
|
||||
charm: ch:cinder
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '6'
|
||||
channel: ussuri/edge
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
charm: ch:keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
admin-password: openstack
|
||||
to:
|
||||
- '7'
|
||||
channel: ussuri/edge
|
||||
|
||||
nagios:
|
||||
charm: cs:nagios
|
||||
series: bionic # not supported on focal yet
|
||||
series: bionic
|
||||
num_units: 1
|
||||
to:
|
||||
- '8'
|
||||
|
|
@ -1,102 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
series: groovy
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
machines:
|
||||
'0':
|
||||
constraints: mem=3072M
|
||||
'1':
|
||||
constraints: mem=3072M
|
||||
'2':
|
||||
constraints: mem=3072M
|
||||
'3':
|
||||
'4':
|
||||
'5':
|
||||
'6':
|
||||
'7':
|
||||
'8':
|
||||
series: bionic # nagios not supported on focal+ yet
|
||||
|
||||
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
cinder-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: "../../../rabbitmq-server"
|
||||
num_units: 3
|
||||
constraints:
|
||||
cpu-cores=2
|
||||
options:
|
||||
min-cluster-size: 3
|
||||
max-cluster-tries: 6
|
||||
ssl: "off"
|
||||
management_plugin: "False"
|
||||
stats_cron_schedule: "*/1 * * * *"
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
- '4'
|
||||
- '5'
|
||||
|
||||
cinder:
|
||||
charm: cs:~openstack-charmers/cinder
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '6'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
admin-password: openstack
|
||||
to:
|
||||
- '7'
|
||||
|
||||
nagios:
|
||||
charm: cs:nagios
|
||||
series: bionic # not supported on focal+ yet
|
||||
num_units: 1
|
||||
to:
|
||||
- '8'
|
||||
|
||||
nrpe:
|
||||
charm: cs:nrpe
|
||||
|
||||
relations:
|
||||
|
||||
- - 'cinder:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
- - 'cinder:shared-db'
|
||||
- 'cinder-mysql-router:shared-db'
|
||||
- - 'cinder-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
- - 'cinder:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
- - 'keystone:shared-db'
|
||||
- 'keystone-mysql-router:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
- - 'nrpe:nrpe-external-master'
|
||||
- 'rabbitmq-server:nrpe-external-master'
|
||||
- - 'nrpe:monitors'
|
||||
- 'nagios:monitors'
|
||||
|
|
@ -1,102 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
series: hirsute
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
machines:
|
||||
'0':
|
||||
constraints: mem=3072M
|
||||
'1':
|
||||
constraints: mem=3072M
|
||||
'2':
|
||||
constraints: mem=3072M
|
||||
'3':
|
||||
'4':
|
||||
'5':
|
||||
'6':
|
||||
'7':
|
||||
'8':
|
||||
series: bionic # nagios not supported on focal+ yet
|
||||
|
||||
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
cinder-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: "../../../rabbitmq-server"
|
||||
num_units: 3
|
||||
constraints:
|
||||
cpu-cores=2
|
||||
options:
|
||||
min-cluster-size: 3
|
||||
max-cluster-tries: 6
|
||||
ssl: "off"
|
||||
management_plugin: "False"
|
||||
stats_cron_schedule: "*/1 * * * *"
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
- '4'
|
||||
- '5'
|
||||
|
||||
cinder:
|
||||
charm: cs:~openstack-charmers/cinder
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '6'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
admin-password: openstack
|
||||
to:
|
||||
- '7'
|
||||
|
||||
nagios:
|
||||
charm: cs:nagios
|
||||
series: bionic # not supported on focal+ yet
|
||||
num_units: 1
|
||||
to:
|
||||
- '8'
|
||||
|
||||
nrpe:
|
||||
charm: cs:nrpe
|
||||
|
||||
relations:
|
||||
|
||||
- - 'cinder:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
- - 'cinder:shared-db'
|
||||
- 'cinder-mysql-router:shared-db'
|
||||
- - 'cinder-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
- - 'cinder:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
- - 'keystone:shared-db'
|
||||
- 'keystone-mysql-router:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
- - 'nrpe:nrpe-external-master'
|
||||
- 'rabbitmq-server:nrpe-external-master'
|
||||
- - 'nrpe:monitors'
|
||||
- 'nagios:monitors'
|
||||
|
|
@ -1,102 +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':
|
||||
'5':
|
||||
'6':
|
||||
'7':
|
||||
'8':
|
||||
series: bionic # nagios not supported on focal+ yet
|
||||
|
||||
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
cinder-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: "../../../rabbitmq-server"
|
||||
num_units: 3
|
||||
constraints:
|
||||
cpu-cores=2
|
||||
options:
|
||||
min-cluster-size: 3
|
||||
max-cluster-tries: 6
|
||||
ssl: "off"
|
||||
management_plugin: "False"
|
||||
stats_cron_schedule: "*/1 * * * *"
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
- '4'
|
||||
- '5'
|
||||
|
||||
cinder:
|
||||
charm: cs:~openstack-charmers/cinder
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '6'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
admin-password: openstack
|
||||
to:
|
||||
- '7'
|
||||
|
||||
nagios:
|
||||
charm: cs:nagios
|
||||
series: bionic # not supported on focal+ yet
|
||||
num_units: 1
|
||||
to:
|
||||
- '8'
|
||||
|
||||
nrpe:
|
||||
charm: cs:nrpe
|
||||
|
||||
relations:
|
||||
|
||||
- - 'cinder:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
- - 'cinder:shared-db'
|
||||
- 'cinder-mysql-router:shared-db'
|
||||
- - 'cinder-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
- - 'cinder:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
- - 'keystone:shared-db'
|
||||
- 'keystone-mysql-router:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
- - 'nrpe:nrpe-external-master'
|
||||
- 'rabbitmq-server:nrpe-external-master'
|
||||
- - 'nrpe:monitors'
|
||||
- 'nagios:monitors'
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
series: xenial
|
||||
|
||||
relations:
|
||||
- - cinder:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - cinder:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - cinder:identity-service
|
||||
- keystone:identity-service
|
||||
- - keystone:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - nrpe:nrpe-external-master
|
||||
- rabbitmq-server:nrpe-external-master
|
||||
- - nrpe:monitors
|
||||
- nagios:monitors
|
||||
|
||||
applications:
|
||||
rabbitmq-server:
|
||||
charm: "../../../rabbitmq-server"
|
||||
num_units: 3
|
||||
constraints:
|
||||
cpu-cores=2
|
||||
options:
|
||||
min-cluster-size: 3
|
||||
max-cluster-tries: 6
|
||||
ssl: "off"
|
||||
management_plugin: "False"
|
||||
stats_cron_schedule: "*/1 * * * *"
|
||||
cinder:
|
||||
charm: cs:~openstack-charmers/cinder
|
||||
num_units: 1
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
max-connections: 1000
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
admin-password: openstack
|
||||
nagios:
|
||||
charm: cs:nagios
|
||||
num_units: 1
|
||||
nrpe:
|
||||
charm: cs:nrpe
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin cloud:xenial-ocata
|
||||
|
||||
series: xenial
|
||||
|
||||
relations:
|
||||
- - cinder:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - cinder:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - cinder:identity-service
|
||||
- keystone:identity-service
|
||||
- - keystone:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - nrpe:nrpe-external-master
|
||||
- rabbitmq-server:nrpe-external-master
|
||||
- - nrpe:monitors
|
||||
- nagios:monitors
|
||||
|
||||
applications:
|
||||
rabbitmq-server:
|
||||
charm: "../../../rabbitmq-server"
|
||||
num_units: 3
|
||||
constraints:
|
||||
cpu-cores=2
|
||||
options:
|
||||
min-cluster-size: 3
|
||||
max-cluster-tries: 6
|
||||
ssl: "off"
|
||||
management_plugin: "False"
|
||||
stats_cron_schedule: "*/1 * * * *"
|
||||
cinder:
|
||||
charm: cs:~openstack-charmers/cinder
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
max-connections: 1000
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
admin-password: openstack
|
||||
nagios:
|
||||
charm: cs:nagios
|
||||
num_units: 1
|
||||
nrpe:
|
||||
charm: cs:nrpe
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin cloud:xenial-pike
|
||||
|
||||
series: xenial
|
||||
|
||||
relations:
|
||||
- - cinder:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - cinder:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - cinder:identity-service
|
||||
- keystone:identity-service
|
||||
- - keystone:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - nrpe:nrpe-external-master
|
||||
- rabbitmq-server:nrpe-external-master
|
||||
- - nrpe:monitors
|
||||
- nagios:monitors
|
||||
|
||||
applications:
|
||||
rabbitmq-server:
|
||||
charm: "../../../rabbitmq-server"
|
||||
num_units: 3
|
||||
constraints:
|
||||
cpu-cores=2
|
||||
options:
|
||||
min-cluster-size: 3
|
||||
max-cluster-tries: 6
|
||||
ssl: "off"
|
||||
management_plugin: "False"
|
||||
stats_cron_schedule: "*/1 * * * *"
|
||||
cinder:
|
||||
charm: cs:~openstack-charmers/cinder
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
max-connections: 1000
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
admin-password: openstack
|
||||
nagios:
|
||||
charm: cs:nagios
|
||||
num_units: 1
|
||||
nrpe:
|
||||
charm: cs:nrpe
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin cloud:xenial-queens
|
||||
|
||||
series: xenial
|
||||
|
||||
relations:
|
||||
- - cinder:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - cinder:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - cinder:identity-service
|
||||
- keystone:identity-service
|
||||
- - keystone:shared-db
|
||||
- percona-cluster:shared-db
|
||||
- - nrpe:nrpe-external-master
|
||||
- rabbitmq-server:nrpe-external-master
|
||||
- - nrpe:monitors
|
||||
- nagios:monitors
|
||||
|
||||
applications:
|
||||
rabbitmq-server:
|
||||
charm: "../../../rabbitmq-server"
|
||||
num_units: 3
|
||||
constraints:
|
||||
cpu-cores=2
|
||||
options:
|
||||
min-cluster-size: 3
|
||||
max-cluster-tries: 6
|
||||
ssl: "off"
|
||||
management_plugin: "False"
|
||||
stats_cron_schedule: "*/1 * * * *"
|
||||
cinder:
|
||||
charm: cs:~openstack-charmers/cinder
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
max-connections: 1000
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
admin-password: openstack
|
||||
nagios:
|
||||
charm: cs:nagios
|
||||
num_units: 1
|
||||
nrpe:
|
||||
charm: cs:nrpe
|
||||
|
|
@ -1,36 +1,14 @@
|
|||
charm_name: rabbitmq-server
|
||||
|
||||
smoke_bundles:
|
||||
- focal-ussuri
|
||||
- focal
|
||||
|
||||
gate_bundles:
|
||||
- xenial-mitaka
|
||||
- bionic-queens
|
||||
- focal-ussuri
|
||||
- focal-wallaby
|
||||
- hirsute-wallaby
|
||||
- bionic
|
||||
- focal
|
||||
|
||||
dev_bundles:
|
||||
- xenial-ocata
|
||||
- xenial-pike
|
||||
- xenial-queens
|
||||
- bionic-rocky
|
||||
- bionic-stein
|
||||
- bionic-train
|
||||
- bionic-ussuri
|
||||
- focal-victoria
|
||||
- groovy-victoria
|
||||
- focal-xena
|
||||
- impish-xena
|
||||
dev_bundles: []
|
||||
|
||||
tests:
|
||||
- zaza.openstack.charm_tests.rabbitmq_server.tests.RabbitMQDeferredRestartTest
|
||||
- zaza.openstack.charm_tests.rabbitmq_server.tests.RmqTests
|
||||
|
||||
tests_options:
|
||||
force_deploy:
|
||||
# the nrpe charm doesn't support groovy and is in the bundle; it needs to
|
||||
# be force installed.
|
||||
- groovy-victoria
|
||||
- hirsute-wallaby
|
||||
- impish-xena
|
||||
|
|
|
|||
17
tox.ini
17
tox.ini
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue