Update to build using charmcraft

Due to a build problem with the reactive plugin, this change falls back
on overriding the steps and doing a manual build, but it also ensures
the CI system builds the charm using charmcraft.  Changes:

- add a build-requirements.txt
- modify charmcraft.yaml
- modify osci.yaml
    -> indicate build with charmcraft
- modify tox.ini
    -> tox -e build does charmcraft build/rename
    -> tox -e build-reactive does the reactive build
- modify bundles to use the <charm>.charm artifact in tests.
  and fix deprecation warning re: prefix
- tox inception to enable tox -e func-test in the CI
- Pin everything in wheelhouse.txt for bionic and focal support.
  This will need updating when the charm channels are created.

func-test-pr: https://github.com/openstack-charmers/zaza-openstack-tests/pull/778
Change-Id: I1fc6374f6201a6ee5dbe46bd23a71a2f7372bbcf
This commit is contained in:
Liam Young 2022-05-23 20:45:13 +00:00
parent 84523ed0b7
commit 9c58c4bb2c
20 changed files with 595 additions and 254 deletions

1
.gitignore vendored
View File

@ -9,3 +9,4 @@ test-charm/
.coverage
cover
*.swp
*.charm

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.

33
charmcraft.yaml Normal file
View File

@ -0,0 +1,33 @@
type: charm
parts:
charm:
build-packages:
- tox
- git
- python3-dev
override-build: |
apt-get install ca-certificates -y
tox -e build-reactive
override-stage: |
echo "Copying charm to staging area: $CHARMCRAFT_STAGE"
NAME=$(ls $CHARMCRAFT_PART_BUILD/build/builds)
cp -r $CHARMCRAFT_PART_BUILD/build/builds/$NAME/* $CHARMCRAFT_STAGE/
override-prime: |
# For some reason, the normal priming chokes on the fact that there's a
# hooks directory.
cp -r $CHARMCRAFT_STAGE/* .
bases:
- build-on:
- name: ubuntu
channel: "20.04"
architectures:
- amd64
run-on:
- name: ubuntu
channel: "20.04"
architectures: [amd64, s390x, ppc64el, arm64]
- name: ubuntu
channel: "22.04"
architectures: [amd64, s390x, ppc64el, arm64]

1
metadata.yaml Symbolic link
View File

@ -0,0 +1 @@
src/metadata.yaml

119
osci.yaml
View File

@ -8,78 +8,79 @@
- bionic-stein-40_trilio-wlm
- bionic-queens-41_trilio-wlm
- bionic-stein-41_trilio-wlm
# Non-voting due to:
# https://bugs.launchpad.net/charm-trilio-data-mover/+bug/1951999
- bionic-train-40_trilio-wlm:
voting: false
- bionic-train-41_trilio-wlm:
voting: false
- bionic-train-41-s3_trilio-wlm:
voting: false
- bionic-ussuri-41_trilio-wlm:
voting: false
- focal-ussuri-41_trilio-wlm:
voting: false
- bionic-train-40_trilio-wlm
- bionic-train-41_trilio-wlm
- bionic-train-41-s3_trilio-wlm
- bionic-ussuri-41_trilio-wlm
- focal-ussuri-41_trilio-wlm
vars:
needs_charm_build: true
charm_build_name: trilio-wlm
build_type: charmcraft
- job:
name: bionic-train-40_trilio-wlm
name: focal-ussuri-41_trilio-wlm
parent: func-target
dependencies:
- osci-lint
- tox-py36
- tox-py38
- tox-py39
vars:
tox_extra_args: bionic-train-40
- job:
name: bionic-stein-40_trilio-wlm
parent: func-target
dependencies: &smoke-jobs
- bionic-train-40_trilio-wlm
vars:
tox_extra_args: bionic-stein-40
- job:
name: bionic-queens-40_trilio-wlm
parent: func-target
dependencies: *smoke-jobs
vars:
tox_extra_args: bionic-queens-40
- job:
name: bionic-train-41_trilio-wlm
parent: func-target
dependencies: *smoke-jobs
vars:
tox_extra_args: bionic-train-41
- job:
name: bionic-stein-41_trilio-wlm
parent: func-target
dependencies: *smoke-jobs
vars:
tox_extra_args: bionic-stein-41
- job:
name: bionic-queens-41_trilio-wlm
parent: func-target
dependencies: *smoke-jobs
vars:
tox_extra_args: bionic-queens-41
- job:
name: bionic-ussuri-41_trilio-wlm
parent: func-target
dependencies: *smoke-jobs
vars:
tox_extra_args: bionic-ussuri-41
- job:
name: focal-ussuri-41_trilio-wlm
parent: func-target
dependencies: *smoke-jobs
- charm-build
vars:
tox_extra_args: focal-ussuri-41
- job:
name: bionic-ussuri-41_trilio-wlm
parent: func-target
dependencies:
- focal-ussuri-41_trilio-wlm
vars:
tox_extra_args: bionic-ussuri-41
- job:
name: bionic-train-41-s3_trilio-wlm
parent: func-target
dependencies: *smoke-jobs
dependencies:
- focal-ussuri-41_trilio-wlm
vars:
tox_extra_args: bionic-train-41-s3
- job:
name: bionic-train-40_trilio-wlm
parent: func-target
dependencies:
- bionic-ussuri-41_trilio-wlm
vars:
tox_extra_args: bionic-train-40
- job:
name: bionic-train-41_trilio-wlm
parent: func-target
dependencies:
- bionic-train-41-s3_trilio-wlm
vars:
tox_extra_args: bionic-train-41
- job:
name: bionic-stein-40_trilio-wlm
parent: func-target
dependencies:
- bionic-train-40_trilio-wlm
vars:
tox_extra_args: bionic-stein-40
- job:
name: bionic-stein-41_trilio-wlm
parent: func-target
dependencies:
- bionic-train-41_trilio-wlm
vars:
tox_extra_args: bionic-stein-41
- job:
name: bionic-queens-40_trilio-wlm
parent: func-target
dependencies:
- bionic-stein-40_trilio-wlm
vars:
tox_extra_args: bionic-queens-40
- job:
name: bionic-queens-41_trilio-wlm
parent: func-target
dependencies:
- bionic-stein-41_trilio-wlm
vars:
tox_extra_args: bionic-queens-41

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

@ -4,6 +4,9 @@
# https://github.com/openstack-charmers/release-tools
#
# Need tox to be available from tox... inception yes, but its a workaround for now
tox
# Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
git+https://github.com/openstack-charmers/zaza.git#egg=zaza
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack

View File

@ -1,5 +1,11 @@
variables:
openstack-origin: &openstack-origin distro
openstack-charm-channel: &openstack-charm-channel 'queens/edge'
ceph-charm-channel: &ceph-charm-channel 'octopus/edge'
rabbit-charm-channel: &rabbit-charm-channel '3.8/edge'
mysql-charm-channel: &mysql-charm-channel '5.7/edge'
vault-charm-channel: &vault-charm-channel '1.7/edge'
trilio-charm-channel: &trilio-charm-channel 'latest/stable'
trilio-openstack-origin: &trilio-openstack-origin 'cloud:bionic-stein'
triliovault-pkg-source: &triliovault-pkg-source 'deb [trusted=yes] https://apt.fury.io/triliodata-4-0/ /'
@ -110,55 +116,64 @@ relations:
- 'mysql:shared-db'
applications:
glance:
charm: cs:~openstack-charmers-next/glance
charm: ch:glance
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: ch:cinder
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
block-device: "None"
glance-api-version: 2
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
channel: *openstack-charm-channel
series: bionic
num_units: 1
options:
openstack-origin: *openstack-origin
admin-password: openstack
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: ch:percona-cluster
channel: *mysql-charm-channel
num_units: 1
options:
innodb-buffer-pool-size: 256M
max-connections: 1000
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: ch:neutron-api
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
flat-network-providers: physnet1
neutron-security-groups: true
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: ch:neutron-gateway
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
bridge-mappings: physnet1:br-ex
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: ch:neutron-openvswitch
channel: *openstack-charm-channel
num_units: 0
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: ch:nova-cloud-controller
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
network-manager: Neutron
debug: true
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: ch:nova-compute
channel: *openstack-charm-channel
num_units: 3
constraints: mem=4G
options:
@ -173,37 +188,43 @@ applications:
# Allow for more retries when testing ontop of openstack
config-flags: block_device_allocate_retries=120
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: ch:rabbitmq-server
channel: *rabbit-charm-channel
num_units: 1
trilio-data-mover:
charm: cs:~openstack-charmers-next/trilio-data-mover
charm: ch:openstack-charmers-trilio-data-mover
channel: *trilio-charm-channel
options:
triliovault-pkg-source: *triliovault-pkg-source
trilio-dm-api:
charm: cs:~openstack-charmers-next/trilio-dm-api
charm: ch:openstack-charmers-trilio-dm-api
channel: *trilio-charm-channel
num_units: 1
options:
openstack-origin: *trilio-openstack-origin
triliovault-pkg-source: *triliovault-pkg-source
trilio-horizon-plugin:
charm: cs:~openstack-charmers-next/trilio-horizon-plugin
charm: ch:openstack-charmers-trilio-horizon-plugin
channel: *trilio-charm-channel
options:
triliovault-pkg-source: *triliovault-pkg-source
trilio-wlm:
charm: ../../../trilio-wlm
charm: ../../../trilio-wlm.charm
series: bionic
num_units: 1
options:
openstack-origin: *trilio-openstack-origin
triliovault-pkg-source: *triliovault-pkg-source
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: ch:ceph-mon
channel: *ceph-charm-channel
num_units: 3
options:
source: *openstack-origin
expected-osd-count: 3
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: ch:ceph-osd
channel: *ceph-charm-channel
constraints: mem=1G
num_units: 3
options:
@ -213,17 +234,20 @@ applications:
storage:
osd-devices: cinder,40G
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: ch:cinder-ceph
channel: *openstack-charm-channel
vault:
charm: ch:vault
channel: *vault-charm-channel
num_units: 1
charm: cs:~openstack-charmers-next/vault
nfs-server-test-fixture:
charm: cs:~openstack-charmers-next/nfs-server-test-fixture
num_units: 1
storage:
share: cinder,40G
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
charm: ch:openstack-dashboard
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin

View File

@ -1,5 +1,11 @@
variables:
openstack-origin: &openstack-origin distro
openstack-charm-channel: &openstack-charm-channel 'queens/edge'
ceph-charm-channel: &ceph-charm-channel 'octopus/edge'
rabbit-charm-channel: &rabbit-charm-channel '3.8/edge'
mysql-charm-channel: &mysql-charm-channel '5.7/edge'
vault-charm-channel: &vault-charm-channel '1.7/edge'
trilio-charm-channel: &trilio-charm-channel 'latest/stable'
trilio-openstack-origin: &trilio-openstack-origin 'cloud:bionic-stein'
triliovault-pkg-source: &triliovault-pkg-source 'deb [trusted=yes] https://apt.fury.io/triliodata-4-1/ /'
@ -110,55 +116,64 @@ relations:
- 'mysql:shared-db'
applications:
glance:
charm: cs:~openstack-charmers-next/glance
charm: ch:glance
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: ch:cinder
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
block-device: "None"
glance-api-version: 2
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
channel: *openstack-charm-channel
series: bionic
num_units: 1
options:
openstack-origin: *openstack-origin
admin-password: openstack
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: ch:percona-cluster
channel: *mysql-charm-channel
num_units: 1
options:
innodb-buffer-pool-size: 256M
max-connections: 1000
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: ch:neutron-api
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
flat-network-providers: physnet1
neutron-security-groups: true
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: ch:neutron-gateway
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
bridge-mappings: physnet1:br-ex
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: ch:neutron-openvswitch
channel: *openstack-charm-channel
num_units: 0
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: ch:nova-cloud-controller
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
network-manager: Neutron
debug: true
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: ch:nova-compute
channel: *openstack-charm-channel
num_units: 3
constraints: mem=4G
options:
@ -173,37 +188,43 @@ applications:
# Allow for more retries when testing ontop of openstack
config-flags: block_device_allocate_retries=120
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: ch:rabbitmq-server
channel: *rabbit-charm-channel
num_units: 1
trilio-data-mover:
charm: cs:~openstack-charmers-next/trilio-data-mover
charm: ch:openstack-charmers-trilio-data-mover
channel: *trilio-charm-channel
options:
triliovault-pkg-source: *triliovault-pkg-source
trilio-dm-api:
charm: cs:~openstack-charmers-next/trilio-dm-api
charm: ch:openstack-charmers-trilio-dm-api
channel: *trilio-charm-channel
num_units: 1
options:
openstack-origin: *trilio-openstack-origin
triliovault-pkg-source: *triliovault-pkg-source
trilio-horizon-plugin:
charm: cs:~openstack-charmers-next/trilio-horizon-plugin
charm: ch:openstack-charmers-trilio-horizon-plugin
channel: *trilio-charm-channel
options:
triliovault-pkg-source: *triliovault-pkg-source
trilio-wlm:
charm: ../../../trilio-wlm
charm: ../../../trilio-wlm.charm
series: bionic
num_units: 1
options:
openstack-origin: *trilio-openstack-origin
triliovault-pkg-source: *triliovault-pkg-source
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: ch:ceph-mon
channel: *ceph-charm-channel
num_units: 3
options:
source: *openstack-origin
expected-osd-count: 3
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: ch:ceph-osd
channel: *ceph-charm-channel
constraints: mem=1G
num_units: 3
options:
@ -213,17 +234,20 @@ applications:
storage:
osd-devices: cinder,40G
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: ch:cinder-ceph
channel: *openstack-charm-channel
vault:
charm: ch:vault
channel: *vault-charm-channel
num_units: 1
charm: cs:~openstack-charmers-next/vault
nfs-server-test-fixture:
charm: cs:~openstack-charmers-next/nfs-server-test-fixture
num_units: 1
storage:
share: cinder,40G
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
charm: ch:openstack-dashboard
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin

View File

@ -1,5 +1,11 @@
variables:
openstack-origin: &openstack-origin 'cloud:bionic-stein'
openstack-charm-channel: &openstack-charm-channel 'stein/edge'
ceph-charm-channel: &ceph-charm-channel 'octopus/edge'
rabbit-charm-channel: &rabbit-charm-channel '3.8/edge'
mysql-charm-channel: &mysql-charm-channel '5.7/edge'
vault-charm-channel: &vault-charm-channel '1.7/edge'
trilio-charm-channel: &trilio-charm-channel 'latest/stable'
triliovault-pkg-source: &triliovault-pkg-source 'deb [trusted=yes] https://apt.fury.io/triliodata-4-0/ /'
series: &series bionic
@ -109,55 +115,64 @@ relations:
- 'mysql:shared-db'
applications:
glance:
charm: cs:~openstack-charmers-next/glance
charm: ch:glance
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: ch:cinder
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
block-device: "None"
glance-api-version: 2
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
channel: *openstack-charm-channel
series: bionic
num_units: 1
options:
openstack-origin: *openstack-origin
admin-password: openstack
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: ch:percona-cluster
channel: *mysql-charm-channel
num_units: 1
options:
innodb-buffer-pool-size: 256M
max-connections: 1000
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: ch:neutron-api
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
flat-network-providers: physnet1
neutron-security-groups: true
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: ch:neutron-gateway
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
bridge-mappings: physnet1:br-ex
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: ch:neutron-openvswitch
channel: *openstack-charm-channel
num_units: 0
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: ch:nova-cloud-controller
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
network-manager: Neutron
debug: true
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: ch:nova-compute
channel: *openstack-charm-channel
num_units: 3
constraints: mem=4G
options:
@ -172,35 +187,41 @@ applications:
# Allow for more retries when testing ontop of openstack
config-flags: block_device_allocate_retries=120
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: ch:rabbitmq-server
channel: *rabbit-charm-channel
num_units: 1
trilio-data-mover:
charm: cs:~openstack-charmers-next/trilio-data-mover
charm: ch:openstack-charmers-trilio-data-mover
channel: *trilio-charm-channel
options:
triliovault-pkg-source: *triliovault-pkg-source
trilio-dm-api:
charm: cs:~openstack-charmers-next/trilio-dm-api
charm: ch:openstack-charmers-trilio-dm-api
channel: *trilio-charm-channel
num_units: 1
options:
triliovault-pkg-source: *triliovault-pkg-source
trilio-horizon-plugin:
charm: cs:~openstack-charmers-next/trilio-horizon-plugin
charm: ch:openstack-charmers-trilio-horizon-plugin
channel: *trilio-charm-channel
options:
triliovault-pkg-source: *triliovault-pkg-source
trilio-wlm:
charm: ../../../trilio-wlm
charm: ../../../trilio-wlm.charm
series: bionic
num_units: 1
options:
triliovault-pkg-source: *triliovault-pkg-source
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: ch:ceph-mon
channel: *ceph-charm-channel
num_units: 3
options:
source: *openstack-origin
expected-osd-count: 3
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: ch:ceph-osd
channel: *ceph-charm-channel
constraints: mem=1G
num_units: 3
options:
@ -210,17 +231,20 @@ applications:
storage:
osd-devices: cinder,40G
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: ch:cinder-ceph
channel: *openstack-charm-channel
vault:
charm: ch:vault
channel: *vault-charm-channel
num_units: 1
charm: cs:~openstack-charmers-next/vault
nfs-server-test-fixture:
charm: cs:~openstack-charmers-next/nfs-server-test-fixture
num_units: 1
storage:
share: cinder,40G
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
charm: ch:openstack-dashboard
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin

View File

@ -1,5 +1,11 @@
variables:
openstack-origin: &openstack-origin 'cloud:bionic-stein'
openstack-charm-channel: &openstack-charm-channel 'stein/edge'
ceph-charm-channel: &ceph-charm-channel 'octopus/edge'
rabbit-charm-channel: &rabbit-charm-channel '3.8/edge'
mysql-charm-channel: &mysql-charm-channel '5.7/edge'
vault-charm-channel: &vault-charm-channel '1.7/edge'
trilio-charm-channel: &trilio-charm-channel 'latest/stable'
triliovault-pkg-source: &triliovault-pkg-source 'deb [trusted=yes] https://apt.fury.io/triliodata-4-1/ /'
series: &series bionic
@ -109,55 +115,64 @@ relations:
- 'mysql:shared-db'
applications:
glance:
charm: cs:~openstack-charmers-next/glance
charm: ch:glance
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: ch:cinder
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
block-device: "None"
glance-api-version: 2
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
channel: *openstack-charm-channel
series: bionic
num_units: 1
options:
openstack-origin: *openstack-origin
admin-password: openstack
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: ch:percona-cluster
channel: *mysql-charm-channel
num_units: 1
options:
innodb-buffer-pool-size: 256M
max-connections: 1000
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: ch:neutron-api
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
flat-network-providers: physnet1
neutron-security-groups: true
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: ch:neutron-gateway
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
bridge-mappings: physnet1:br-ex
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: ch:neutron-openvswitch
channel: *openstack-charm-channel
num_units: 0
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: ch:nova-cloud-controller
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
network-manager: Neutron
debug: true
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: ch:nova-compute
channel: *openstack-charm-channel
num_units: 3
constraints: mem=4G
options:
@ -172,35 +187,41 @@ applications:
# Allow for more retries when testing ontop of openstack
config-flags: block_device_allocate_retries=120
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: ch:rabbitmq-server
channel: *rabbit-charm-channel
num_units: 1
trilio-data-mover:
charm: cs:~openstack-charmers-next/trilio-data-mover
charm: ch:openstack-charmers-trilio-data-mover
channel: *trilio-charm-channel
options:
triliovault-pkg-source: *triliovault-pkg-source
trilio-dm-api:
charm: cs:~openstack-charmers-next/trilio-dm-api
charm: ch:openstack-charmers-trilio-dm-api
channel: *trilio-charm-channel
num_units: 1
options:
triliovault-pkg-source: *triliovault-pkg-source
trilio-horizon-plugin:
charm: cs:~openstack-charmers-next/trilio-horizon-plugin
charm: ch:openstack-charmers-trilio-horizon-plugin
channel: *trilio-charm-channel
options:
triliovault-pkg-source: *triliovault-pkg-source
trilio-wlm:
charm: ../../../trilio-wlm
charm: ../../../trilio-wlm.charm
series: bionic
num_units: 1
options:
triliovault-pkg-source: *triliovault-pkg-source
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: ch:ceph-mon
channel: *ceph-charm-channel
num_units: 3
options:
source: *openstack-origin
expected-osd-count: 3
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: ch:ceph-osd
channel: *ceph-charm-channel
constraints: mem=1G
num_units: 3
options:
@ -210,17 +231,20 @@ applications:
storage:
osd-devices: cinder,40G
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: ch:cinder-ceph
channel: *openstack-charm-channel
vault:
charm: ch:vault
channel: *vault-charm-channel
num_units: 1
charm: cs:~openstack-charmers-next/vault
nfs-server-test-fixture:
charm: cs:~openstack-charmers-next/nfs-server-test-fixture
num_units: 1
storage:
share: cinder,40G
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
charm: ch:openstack-dashboard
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin

View File

@ -1,7 +1,14 @@
variables:
openstack-origin: &openstack-origin 'cloud:bionic-train'
openstack-charm-channel: &openstack-charm-channel 'train/edge'
ceph-charm-channel: &ceph-charm-channel 'octopus/edge'
rabbit-charm-channel: &rabbit-charm-channel '3.8/edge'
mysql-charm-channel: &mysql-charm-channel '5.7/edge'
vault-charm-channel: &vault-charm-channel '1.7/edge'
trilio-charm-channel: &trilio-charm-channel 'latest/stable'
triliovault-pkg-source: &triliovault-pkg-source 'deb [trusted=yes] https://apt.fury.io/triliodata-4-0/ /'
series: &series bionic
relations:
@ -117,55 +124,64 @@ relations:
- 'mysql:shared-db'
applications:
glance:
charm: cs:~openstack-charmers-next/glance
charm: ch:glance
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: ch:cinder
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
block-device: "None"
glance-api-version: 2
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
channel: *openstack-charm-channel
series: bionic
num_units: 1
options:
openstack-origin: *openstack-origin
admin-password: openstack
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: ch:percona-cluster
channel: *mysql-charm-channel
num_units: 1
options:
innodb-buffer-pool-size: 256M
max-connections: 1000
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: ch:neutron-api
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
flat-network-providers: physnet1
neutron-security-groups: true
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: ch:neutron-gateway
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
bridge-mappings: physnet1:br-ex
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: ch:neutron-openvswitch
channel: *openstack-charm-channel
num_units: 0
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: ch:nova-cloud-controller
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
network-manager: Neutron
debug: true
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: ch:nova-compute
channel: *openstack-charm-channel
num_units: 3
constraints: mem=4G
options:
@ -180,37 +196,43 @@ applications:
# Allow for more retries when testing ontop of openstack
config-flags: block_device_allocate_retries=120
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: ch:rabbitmq-server
channel: *rabbit-charm-channel
num_units: 1
trilio-data-mover:
charm: cs:~openstack-charmers-next/trilio-data-mover
charm: ch:openstack-charmers-trilio-data-mover
channel: *trilio-charm-channel
options:
triliovault-pkg-source: *triliovault-pkg-source
trilio-dm-api:
charm: cs:~openstack-charmers-next/trilio-dm-api
charm: ch:openstack-charmers-trilio-dm-api
channel: *trilio-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
triliovault-pkg-source: *triliovault-pkg-source
trilio-horizon-plugin:
charm: cs:~openstack-charmers-next/trilio-horizon-plugin
charm: ch:openstack-charmers-trilio-horizon-plugin
channel: *trilio-charm-channel
options:
triliovault-pkg-source: *triliovault-pkg-source
trilio-wlm:
charm: ../../../trilio-wlm
charm: ../../../trilio-wlm.charm
series: bionic
num_units: 1
options:
openstack-origin: *openstack-origin
triliovault-pkg-source: *triliovault-pkg-source
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: ch:ceph-mon
channel: *ceph-charm-channel
num_units: 3
options:
source: *openstack-origin
expected-osd-count: 3
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: ch:ceph-osd
channel: *ceph-charm-channel
constraints: mem=1G
num_units: 3
options:
@ -220,12 +242,15 @@ applications:
storage:
osd-devices: cinder,40G
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: ch:cinder-ceph
channel: *openstack-charm-channel
vault:
charm: ch:vault
channel: *vault-charm-channel
num_units: 1
charm: cs:~openstack-charmers-next/vault
placement:
charm: cs:~openstack-charmers-next/placement
charm: ch:placement
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
@ -235,7 +260,8 @@ applications:
storage:
share: cinder,40G
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
charm: ch:openstack-dashboard
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin

View File

@ -1,5 +1,11 @@
variables:
openstack-origin: &openstack-origin 'cloud:bionic-train'
openstack-charm-channel: &openstack-charm-channel 'train/edge'
ceph-charm-channel: &ceph-charm-channel 'octopus/edge'
rabbit-charm-channel: &rabbit-charm-channel '3.8/edge'
mysql-charm-channel: &mysql-charm-channel '5.7/edge'
vault-charm-channel: &vault-charm-channel '1.7/edge'
trilio-charm-channel: &trilio-charm-channel 'latest/stable'
triliovault-pkg-source: &triliovault-pkg-source 'deb [trusted=yes] https://apt.fury.io/triliodata-4-1/ /'
series: &series bionic
@ -123,59 +129,69 @@ relations:
- 'vault:certificates'
applications:
ceph-radosgw:
charm: cs:~openstack-charmers-next/ceph-radosgw
charm: ch:ceph-radosgw
channel: *ceph-charm-channel
num_units: 1
options:
source: *openstack-origin
glance:
charm: cs:~openstack-charmers-next/glance
charm: ch:glance
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: ch:cinder
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
block-device: "None"
glance-api-version: 2
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
admin-password: openstack
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: ch:percona-cluster
channel: *mysql-charm-channel
num_units: 1
options:
innodb-buffer-pool-size: 256M
max-connections: 1000
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: ch:neutron-api
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
flat-network-providers: physnet1
neutron-security-groups: true
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: ch:neutron-gateway
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
bridge-mappings: physnet1:br-ex
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: ch:neutron-openvswitch
channel: *openstack-charm-channel
num_units: 0
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: ch:nova-cloud-controller
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
network-manager: Neutron
debug: true
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: ch:nova-compute
channel: *openstack-charm-channel
num_units: 3
constraints: mem=4G
options:
@ -190,38 +206,44 @@ applications:
# Allow for more retries when testing ontop of openstack
config-flags: block_device_allocate_retries=120
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: ch:rabbitmq-server
channel: *rabbit-charm-channel
num_units: 1
trilio-data-mover:
charm: cs:~openstack-charmers-next/trilio-data-mover
charm: ch:openstack-charmers-trilio-data-mover
channel: *trilio-charm-channel
options:
triliovault-pkg-source: *triliovault-pkg-source
backup-target-type: experimental-s3
trilio-dm-api:
charm: cs:~openstack-charmers-next/trilio-dm-api
charm: ch:openstack-charmers-trilio-dm-api
channel: *trilio-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
triliovault-pkg-source: *triliovault-pkg-source
trilio-horizon-plugin:
charm: cs:~openstack-charmers-next/trilio-horizon-plugin
charm: ch:openstack-charmers-trilio-horizon-plugin
channel: *trilio-charm-channel
options:
triliovault-pkg-source: *triliovault-pkg-source
trilio-wlm:
charm: ../../../trilio-wlm
charm: ../../../trilio-wlm.charm
num_units: 1
options:
openstack-origin: *openstack-origin
triliovault-pkg-source: *triliovault-pkg-source
backup-target-type: s3
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: ch:ceph-mon
channel: *ceph-charm-channel
num_units: 3
options:
source: *openstack-origin
expected-osd-count: 3
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: ch:ceph-osd
channel: *ceph-charm-channel
constraints: mem=1G
num_units: 3
options:
@ -231,17 +253,21 @@ applications:
storage:
osd-devices: cinder,40G
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: ch:cinder-ceph
channel: *openstack-charm-channel
vault:
num_units: 1
charm: cs:~openstack-charmers-next/vault
charm: ch:vault
channel: *vault-charm-channel
placement:
charm: cs:~openstack-charmers-next/placement
charm: ch:placement
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
charm: ch:openstack-dashboard
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin

View File

@ -1,7 +1,14 @@
variables:
openstack-origin: &openstack-origin 'cloud:bionic-train'
openstack-charm-channel: &openstack-charm-channel 'train/edge'
ceph-charm-channel: &ceph-charm-channel 'octopus/edge'
rabbit-charm-channel: &rabbit-charm-channel '3.8/edge'
mysql-charm-channel: &mysql-charm-channel '5.7/edge'
vault-charm-channel: &vault-charm-channel '1.7/edge'
trilio-charm-channel: &trilio-charm-channel 'latest/stable'
triliovault-pkg-source: &triliovault-pkg-source 'deb [trusted=yes] https://apt.fury.io/triliodata-4-1/ /'
series: &series bionic
relations:
@ -117,55 +124,64 @@ relations:
- 'mysql:shared-db'
applications:
glance:
charm: cs:~openstack-charmers-next/glance
charm: ch:glance
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: ch:cinder
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
block-device: "None"
glance-api-version: 2
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
channel: *openstack-charm-channel
series: bionic
num_units: 1
options:
openstack-origin: *openstack-origin
admin-password: openstack
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: ch:percona-cluster
channel: *mysql-charm-channel
num_units: 1
options:
innodb-buffer-pool-size: 256M
max-connections: 1000
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: ch:neutron-api
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
flat-network-providers: physnet1
neutron-security-groups: true
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: ch:neutron-gateway
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
bridge-mappings: physnet1:br-ex
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: ch:neutron-openvswitch
channel: *openstack-charm-channel
num_units: 0
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: ch:nova-cloud-controller
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
network-manager: Neutron
debug: true
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: ch:nova-compute
channel: *openstack-charm-channel
num_units: 3
constraints: mem=4G
options:
@ -180,37 +196,43 @@ applications:
# Allow for more retries when testing ontop of openstack
config-flags: block_device_allocate_retries=120
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: ch:rabbitmq-server
channel: *rabbit-charm-channel
num_units: 1
trilio-data-mover:
charm: cs:~openstack-charmers-next/trilio-data-mover
charm: ch:openstack-charmers-trilio-data-mover
channel: *trilio-charm-channel
options:
triliovault-pkg-source: *triliovault-pkg-source
trilio-dm-api:
charm: cs:~openstack-charmers-next/trilio-dm-api
charm: ch:openstack-charmers-trilio-dm-api
channel: *trilio-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
triliovault-pkg-source: *triliovault-pkg-source
trilio-horizon-plugin:
charm: cs:~openstack-charmers-next/trilio-horizon-plugin
charm: ch:openstack-charmers-trilio-horizon-plugin
channel: *trilio-charm-channel
options:
triliovault-pkg-source: *triliovault-pkg-source
trilio-wlm:
charm: ../../../trilio-wlm
charm: ../../../trilio-wlm.charm
series: bionic
num_units: 1
options:
openstack-origin: *openstack-origin
triliovault-pkg-source: *triliovault-pkg-source
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: ch:ceph-mon
channel: *ceph-charm-channel
num_units: 3
options:
source: *openstack-origin
expected-osd-count: 3
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: ch:ceph-osd
channel: *ceph-charm-channel
constraints: mem=1G
num_units: 3
options:
@ -220,12 +242,15 @@ applications:
storage:
osd-devices: cinder,40G
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
charm: ch:cinder-ceph
channel: *openstack-charm-channel
vault:
charm: ch:vault
channel: *vault-charm-channel
num_units: 1
charm: cs:~openstack-charmers-next/vault
placement:
charm: cs:~openstack-charmers-next/placement
charm: ch:placement
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
@ -235,7 +260,8 @@ applications:
storage:
share: cinder,40G
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
charm: ch:openstack-dashboard
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin

View File

@ -1,7 +1,14 @@
variables:
openstack-origin: &openstack-origin 'cloud:bionic-ussuri'
openstack-charm-channel: &openstack-charm-channel 'ussuri/edge'
ceph-charm-channel: &ceph-charm-channel 'octopus/edge'
rabbit-charm-channel: &rabbit-charm-channel '3.8/edge'
mysql-charm-channel: &mysql-charm-channel '5.7/edge'
vault-charm-channel: &vault-charm-channel '1.7/edge'
trilio-charm-channel: &trilio-charm-channel 'latest/stable'
triliovault-pkg-source: &triliovault-pkg-source 'deb [trusted=yes] https://apt.fury.io/triliodata-4-1/ /'
series: &series bionic
relations:
@ -117,32 +124,37 @@ relations:
- 'mysql:shared-db'
applications:
glance:
charm: cs:~openstack-charmers-next/glance
charm: ch:glance
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: ch:cinder
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
block-device: "None"
glance-api-version: 2
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
channel: *openstack-charm-channel
series: bionic
num_units: 1
options:
openstack-origin: *openstack-origin
admin-password: openstack
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: ch:percona-cluster
channel: *mysql-charm-channel
num_units: 1
options:
innodb-buffer-pool-size: 256M
max-connections: 1000
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: ch:neutron-api
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
@ -150,23 +162,27 @@ applications:
neutron-security-groups: true
manage-neutron-plugin-legacy-mode: True
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: ch:neutron-gateway
channel: *openstack-charm-channel
num_units: 1
options:
openstack-origin: *openstack-origin
bridge-mappings: physnet1:br-ex
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: ch:neutron-openvswitch
channel: *openstack-charm-channel
num_units: 0
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: ch:nova-cloud-controller
channel: *openstack-charm-channel
num_units: 1
options: