Migrate charm charmhub for stable/victoria
- start from stable/victoria branch - Do charmcraft, osci, zuul changes - Modify libs to point to stable/victoria for: - charmhelpers - charms.openstack (as needed) - zaza & zaza.openstack.tests - Remove unsupported test bundles - migration bundles to charmhub.io (ch: prefix + channels) - Build on 20.04 amd64 - Run on 20.04 amd64, s390x, ppc64el, arm64 Change-Id: I9b2ac7d18b8ebe80c41a22579c74b136b9b19714
This commit is contained in:
Alex Kavanagh
parent
e73d7d563f
commit
43abc20dde
1
.gitignore
vendored
1
.gitignore
vendored
@ -10,3 +10,4 @@ tags
|
||||
.stestr
|
||||
func-results.json
|
||||
tests/keystone_juju_ca_cert.crt
|
||||
*.charm
|
||||
|
||||
@ -3,4 +3,4 @@ host=review.opendev.org
|
||||
port=29418
|
||||
project=openstack/charm-openstack-dashboard.git
|
||||
|
||||
defaultbranch=stable/21.10
|
||||
defaultbranch=stable/victoria
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
- project:
|
||||
templates:
|
||||
- python35-charm-jobs
|
||||
- openstack-python3-ussuri-jobs
|
||||
- openstack-python3-victoria-jobs
|
||||
- openstack-cover-jobs
|
||||
|
||||
7
build-requirements.txt
Normal file
7
build-requirements.txt
Normal file
@ -0,0 +1,7 @@
|
||||
# NOTES(lourot):
|
||||
# * We don't install charmcraft via pip anymore because it anyway spins up a
|
||||
# container and scp the system's charmcraft snap inside it. So the charmcraft
|
||||
# snap is necessary on the system anyway.
|
||||
# * `tox -e build` successfully validated with charmcraft 1.2.1
|
||||
|
||||
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
|
||||
@ -1,4 +1,4 @@
|
||||
repo: https://github.com/juju/charm-helpers@stable/21.10
|
||||
repo: https://github.com/juju/charm-helpers@stable/victoria
|
||||
destination: charmhelpers
|
||||
include:
|
||||
- core
|
||||
|
||||
33
charmcraft.yaml
Normal file
33
charmcraft.yaml
Normal file
@ -0,0 +1,33 @@
|
||||
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
|
||||
run-on:
|
||||
- name: ubuntu
|
||||
channel: "20.04"
|
||||
architectures: [amd64, s390x, ppc64el, arm64]
|
||||
@ -10,12 +10,7 @@ tags:
|
||||
extra-bindings:
|
||||
public: # Only used to allow specifying a hostname for DNS-HA.
|
||||
series:
|
||||
- xenial
|
||||
- bionic
|
||||
- focal
|
||||
- groovy
|
||||
- hirsute
|
||||
- impish
|
||||
provides:
|
||||
nrpe-external-master:
|
||||
interface: nrpe-external-master
|
||||
|
||||
44
osci.yaml
44
osci.yaml
@ -1,41 +1,9 @@
|
||||
- project:
|
||||
templates:
|
||||
- charm-unit-jobs
|
||||
check:
|
||||
jobs:
|
||||
- bionic-train-gr
|
||||
- checklist-work-required-xenial-mitaka
|
||||
- checklist-work-required-bionic-queens
|
||||
- bionic-rocky
|
||||
- bionic-stein
|
||||
- bionic-train
|
||||
- bionic-ussuri
|
||||
- focal-ussuri
|
||||
- focal-victoria
|
||||
- focal-wallaby
|
||||
- focal-xena:
|
||||
voting: false
|
||||
- groovy-victoria
|
||||
- hirsute-wallaby
|
||||
- impish-xena:
|
||||
voting: false
|
||||
|
||||
- job:
|
||||
name: checklist-work-required-xenial-mitaka
|
||||
parent: func-target
|
||||
dependencies: &smoke-jobs
|
||||
- bionic-ussuri
|
||||
- charm-unit-jobs-py38
|
||||
- charm-focal-ussuri-functional-jobs
|
||||
- charm-victoria-functional-jobs
|
||||
vars:
|
||||
tox_extra_args: checklist-work-required:xenial-mitaka
|
||||
- job:
|
||||
name: checklist-work-required-bionic-queens
|
||||
parent: func-target
|
||||
dependencies: *smoke-jobs
|
||||
vars:
|
||||
tox_extra_args: checklist-work-required:bionic-queens
|
||||
- job:
|
||||
name: bionic-train-gr
|
||||
parent: func-target
|
||||
dependencies: *smoke-jobs
|
||||
vars:
|
||||
tox_extra_args: vault:bionic-vault dashboard:bionic-queens-cmr-vault
|
||||
needs_charm_build: true
|
||||
charm_build_name: openstack-dashboard
|
||||
build_type: charmcraft
|
||||
|
||||
13
rename.sh
Executable file
13
rename.sh
Executable file
@ -0,0 +1,13 @@
|
||||
#!/bin/bash
|
||||
charm=$(grep "charm_build_name" osci.yaml | awk '{print $2}')
|
||||
echo "renaming ${charm}_*.charm to ${charm}.charm"
|
||||
echo -n "pwd: "
|
||||
pwd
|
||||
ls -al
|
||||
echo "Removing bad downloaded charm maybe?"
|
||||
if [[ -e "${charm}.charm" ]];
|
||||
then
|
||||
rm "${charm}.charm"
|
||||
fi
|
||||
echo "Renaming charm here."
|
||||
mv ${charm}_*.charm ${charm}.charm
|
||||
@ -7,6 +7,7 @@
|
||||
# requirements. They are intertwined. Also, Zaza itself should specify
|
||||
# all of its own requirements and if it doesn't, fix it there.
|
||||
#
|
||||
pyparsing<3.0.0 # cffi needs pyparsing < 3.0.0.
|
||||
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
|
||||
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
||||
|
||||
@ -37,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/victoria#egg=zaza
|
||||
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/victoria#egg=zaza.openstack
|
||||
|
||||
# Needed for charm-glance:
|
||||
git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.6'
|
||||
|
||||
@ -1,47 +0,0 @@
|
||||
series: bionic
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
- 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
|
||||
|
||||
machines:
|
||||
'0':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
'1':
|
||||
constraints: virt-type=kvm
|
||||
'2':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
'3':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
'4':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
|
||||
relations:
|
||||
- ["keystone:shared-db", "mysql:shared-db"]
|
||||
- ["openstack-dashboard:shared-db", "mysql:shared-db"]
|
||||
- ["openstack-dashboard:identity-service", "keystone:identity-service"]
|
||||
- ["openstack-dashboard:ha", "hacluster:ha"]
|
||||
|
||||
applications:
|
||||
mysql:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
to:
|
||||
- '0'
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
to:
|
||||
- '1'
|
||||
openstack-dashboard:
|
||||
charm: ../../../openstack-dashboard
|
||||
num_units: 3
|
||||
to:
|
||||
- '2'
|
||||
- '3'
|
||||
- '4'
|
||||
hacluster:
|
||||
charm: cs:~openstack-charmers/hacluster
|
||||
options:
|
||||
corosync_transport: unicast
|
||||
cluster_count: 3
|
||||
@ -1,35 +0,0 @@
|
||||
series: bionic
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
- 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
|
||||
|
||||
machines:
|
||||
'0':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
'1':
|
||||
constraints: virt-type=kvm
|
||||
'2':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
|
||||
relations:
|
||||
- ["keystone:shared-db", "mysql:shared-db"]
|
||||
- ["openstack-dashboard:shared-db", "mysql:shared-db"]
|
||||
- ["openstack-dashboard:identity-service", "keystone:identity-service"]
|
||||
|
||||
applications:
|
||||
mysql:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
to:
|
||||
- '0'
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
to:
|
||||
- '1'
|
||||
openstack-dashboard:
|
||||
charm: ../../../openstack-dashboard
|
||||
num_units: 1
|
||||
to:
|
||||
- '2'
|
||||
@ -1,39 +0,0 @@
|
||||
series: bionic
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
- 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
|
||||
|
||||
machines:
|
||||
'0':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
'1':
|
||||
constraints: virt-type=kvm
|
||||
'2':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
|
||||
relations:
|
||||
- ["keystone:shared-db", "mysql:shared-db"]
|
||||
- ["openstack-dashboard:shared-db", "mysql:shared-db"]
|
||||
- ["openstack-dashboard:identity-service", "keystone:identity-service"]
|
||||
|
||||
applications:
|
||||
mysql:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
to:
|
||||
- '0'
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-rocky
|
||||
to:
|
||||
- '1'
|
||||
openstack-dashboard:
|
||||
charm: ../../../openstack-dashboard
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-rocky
|
||||
to:
|
||||
- '2'
|
||||
@ -1,39 +0,0 @@
|
||||
series: bionic
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
- 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
|
||||
|
||||
machines:
|
||||
'0':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
'1':
|
||||
constraints: virt-type=kvm
|
||||
'2':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
|
||||
relations:
|
||||
- ["keystone:shared-db", "mysql:shared-db"]
|
||||
- ["openstack-dashboard:shared-db", "mysql:shared-db"]
|
||||
- ["openstack-dashboard:identity-service", "keystone:identity-service"]
|
||||
|
||||
applications:
|
||||
mysql:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
to:
|
||||
- '0'
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-stein
|
||||
to:
|
||||
- '1'
|
||||
openstack-dashboard:
|
||||
charm: ../../../openstack-dashboard
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-stein
|
||||
to:
|
||||
- '2'
|
||||
@ -1,39 +0,0 @@
|
||||
series: bionic
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
- 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
|
||||
|
||||
machines:
|
||||
'0':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
'1':
|
||||
constraints: virt-type=kvm
|
||||
'2':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
|
||||
relations:
|
||||
- ["keystone:shared-db", "mysql:shared-db"]
|
||||
- ["openstack-dashboard:shared-db", "mysql:shared-db"]
|
||||
- ["openstack-dashboard:identity-service", "keystone:identity-service"]
|
||||
|
||||
applications:
|
||||
mysql:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
to:
|
||||
- '0'
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-train
|
||||
to:
|
||||
- '1'
|
||||
openstack-dashboard:
|
||||
charm: ../../../openstack-dashboard
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-train
|
||||
to:
|
||||
- '2'
|
||||
@ -1,39 +0,0 @@
|
||||
series: bionic
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
- 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
|
||||
|
||||
machines:
|
||||
'0':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
'1':
|
||||
constraints: virt-type=kvm
|
||||
'2':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
|
||||
relations:
|
||||
- ["keystone:shared-db", "mysql:shared-db"]
|
||||
- ["openstack-dashboard:shared-db", "mysql:shared-db"]
|
||||
- ["openstack-dashboard:identity-service", "keystone:identity-service"]
|
||||
|
||||
applications:
|
||||
mysql:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
to:
|
||||
- '0'
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-ussuri
|
||||
to:
|
||||
- '1'
|
||||
openstack-dashboard:
|
||||
charm: ../../../openstack-dashboard
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-ussuri
|
||||
to:
|
||||
- '2'
|
||||
@ -1,12 +0,0 @@
|
||||
series: bionic
|
||||
services:
|
||||
vault:
|
||||
num_units: 1
|
||||
series: bionic
|
||||
charm: cs:~openstack-charmers/vault
|
||||
mysql:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
relations:
|
||||
- - vault:shared-db
|
||||
- mysql:shared-db
|
||||
@ -1,3 +1,5 @@
|
||||
local_overlay_enabled: False
|
||||
|
||||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
@ -22,12 +24,14 @@ machines:
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
charm: ch:mysql-router
|
||||
channel: 8.0.19/stable
|
||||
openstack-dashboard-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
charm: ch:mysql-router
|
||||
channel: 8.0.19/stable
|
||||
|
||||
mysql-innodb-cluster:
|
||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
||||
charm: ch:mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
@ -35,17 +39,19 @@ applications:
|
||||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
channel: 8.0.19/stable
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
charm: ch:keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
channel: victoria/edge
|
||||
|
||||
openstack-dashboard:
|
||||
charm: ../../../openstack-dashboard
|
||||
charm: ../../openstack-dashboard.charm
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
local_overlay_enabled: False
|
||||
|
||||
variables:
|
||||
openstack-origin: &openstack-origin cloud:focal-victoria
|
||||
|
||||
@ -22,12 +24,14 @@ machines:
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
charm: ch:mysql-router
|
||||
channel: 8.0.19/stable
|
||||
openstack-dashboard-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
charm: ch:mysql-router
|
||||
channel: 8.0.19/stable
|
||||
|
||||
mysql-innodb-cluster:
|
||||
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
||||
charm: ch:mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
@ -35,17 +39,19 @@ applications:
|
||||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
channel: 8.0.19/stable
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
charm: ch:keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
channel: victoria/edge
|
||||
|
||||
openstack-dashboard:
|
||||
charm: ../../../openstack-dashboard
|
||||
charm: ../../openstack-dashboard.charm
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
||||
@ -1,69 +0,0 @@
|
||||
variables:
|
||||
openstack-origin: &openstack-origin cloud:focal-wallaby
|
||||
|
||||
series: focal
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
- 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
|
||||
|
||||
machines:
|
||||
'0':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
'1':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
'2':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
'3':
|
||||
constraints: virt-type=kvm
|
||||
'4':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
openstack-dashboard-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'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
|
||||
openstack-dashboard:
|
||||
charm: ../../../openstack-dashboard
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
|
||||
relations:
|
||||
|
||||
- - 'keystone:shared-db'
|
||||
- 'keystone-mysql-router:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'openstack-dashboard:shared-db'
|
||||
- 'openstack-dashboard-mysql-router:shared-db'
|
||||
- - 'openstack-dashboard-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
|
||||
- - 'openstack-dashboard:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
@ -1,69 +0,0 @@
|
||||
variables:
|
||||
openstack-origin: &openstack-origin cloud:focal-xena
|
||||
|
||||
series: focal
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
- 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
|
||||
|
||||
machines:
|
||||
'0':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
'1':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
'2':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
'3':
|
||||
constraints: virt-type=kvm
|
||||
'4':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
openstack-dashboard-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'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
|
||||
openstack-dashboard:
|
||||
charm: ../../../openstack-dashboard
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
|
||||
relations:
|
||||
|
||||
- - 'keystone:shared-db'
|
||||
- 'keystone-mysql-router:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'openstack-dashboard:shared-db'
|
||||
- 'openstack-dashboard-mysql-router:shared-db'
|
||||
- - 'openstack-dashboard-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
|
||||
- - 'openstack-dashboard:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
@ -1,69 +0,0 @@
|
||||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
series: groovy
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
- 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
|
||||
|
||||
machines:
|
||||
'0':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
'1':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
'2':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
'3':
|
||||
constraints: virt-type=kvm
|
||||
'4':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
openstack-dashboard-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'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
|
||||
openstack-dashboard:
|
||||
charm: ../../../openstack-dashboard
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
|
||||
relations:
|
||||
|
||||
- - 'keystone:shared-db'
|
||||
- 'keystone-mysql-router:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'openstack-dashboard:shared-db'
|
||||
- 'openstack-dashboard-mysql-router:shared-db'
|
||||
- - 'openstack-dashboard-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
|
||||
- - 'openstack-dashboard:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
@ -1,69 +0,0 @@
|
||||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
series: hirsute
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
- 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
|
||||
|
||||
machines:
|
||||
'0':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
'1':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
'2':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
'3':
|
||||
constraints: virt-type=kvm
|
||||
'4':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
openstack-dashboard-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'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
|
||||
openstack-dashboard:
|
||||
charm: ../../../openstack-dashboard
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
|
||||
relations:
|
||||
|
||||
- - 'keystone:shared-db'
|
||||
- 'keystone-mysql-router:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'openstack-dashboard:shared-db'
|
||||
- 'openstack-dashboard-mysql-router:shared-db'
|
||||
- - 'openstack-dashboard-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
|
||||
- - 'openstack-dashboard:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
@ -1,69 +0,0 @@
|
||||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
series: impish
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
- 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
|
||||
|
||||
machines:
|
||||
'0':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
'1':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
'2':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
'3':
|
||||
constraints: virt-type=kvm
|
||||
'4':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
openstack-dashboard-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'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
|
||||
openstack-dashboard:
|
||||
charm: ../../../openstack-dashboard
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
|
||||
relations:
|
||||
|
||||
- - 'keystone:shared-db'
|
||||
- 'keystone-mysql-router:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'openstack-dashboard:shared-db'
|
||||
- 'openstack-dashboard-mysql-router:shared-db'
|
||||
- - 'openstack-dashboard-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
|
||||
- - 'openstack-dashboard:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
@ -1,12 +0,0 @@
|
||||
applications:
|
||||
openstack-dashboard:
|
||||
options:
|
||||
vip: '{{ OS_VIP00 }}'
|
||||
relations:
|
||||
- - openstack-dashboard:certificates
|
||||
- vault:certificates
|
||||
- - keystone:certificates
|
||||
- vault:certificates
|
||||
saas:
|
||||
vault:
|
||||
url: admin/{{ vault }}.vault
|
||||
@ -1,7 +0,0 @@
|
||||
applications:
|
||||
vault:
|
||||
offers:
|
||||
vault:
|
||||
endpoints:
|
||||
- secrets
|
||||
- certificates
|
||||
@ -1,35 +0,0 @@
|
||||
series: xenial
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
- 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
|
||||
|
||||
machines:
|
||||
'0':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
'1':
|
||||
constraints: virt-type=kvm
|
||||
'2':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
|
||||
relations:
|
||||
- ["keystone:shared-db", "mysql:shared-db"]
|
||||
- ["openstack-dashboard:shared-db", "mysql:shared-db"]
|
||||
- ["openstack-dashboard:identity-service", "keystone:identity-service"]
|
||||
|
||||
applications:
|
||||
mysql:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
to:
|
||||
- '0'
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
to:
|
||||
- '1'
|
||||
openstack-dashboard:
|
||||
charm: ../../../openstack-dashboard
|
||||
num_units: 1
|
||||
to:
|
||||
- '2'
|
||||
@ -1,39 +0,0 @@
|
||||
series: xenial
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
- 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
|
||||
|
||||
machines:
|
||||
'0':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
'1':
|
||||
constraints: virt-type=kvm
|
||||
'2':
|
||||
constraints: virt-type=kvm mem=3072M
|
||||
|
||||
relations:
|
||||
- ["keystone:shared-db", "mysql:shared-db"]
|
||||
- ["openstack-dashboard:shared-db", "mysql:shared-db"]
|
||||
- ["openstack-dashboard:identity-service", "keystone:identity-service"]
|
||||
|
||||
applications:
|
||||
mysql:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
to:
|
||||
- '0'
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:xenial-queens
|
||||
to:
|
||||
- '1'
|
||||
openstack-dashboard:
|
||||
charm: ../../../openstack-dashboard
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:xenial-queens
|
||||
to:
|
||||
- '2'
|
||||
@ -4,29 +4,13 @@ comment:
|
||||
- ''
|
||||
|
||||
smoke_bundles:
|
||||
- focal-ussuri
|
||||
- focal-victoria
|
||||
|
||||
gate_bundles:
|
||||
- bionic-train-gr:
|
||||
- vault: bionic-vault
|
||||
- dashboard: bionic-queens-cmr-vault
|
||||
# See bug #1915293 for more details
|
||||
- checklist-work-required: xenial-mitaka
|
||||
- checklist-work-required: xenial-queens
|
||||
- checklist-work-required: bionic-queens
|
||||
- bionic-rocky
|
||||
- bionic-stein
|
||||
- bionic-train
|
||||
- bionic-ussuri
|
||||
- focal-ussuri
|
||||
- focal-victoria
|
||||
- focal-wallaby
|
||||
- groovy-victoria
|
||||
|
||||
dev_bundles:
|
||||
- focal-xena
|
||||
- hirsute-wallaby
|
||||
- impish-xena
|
||||
dev_bundles: []
|
||||
|
||||
configure:
|
||||
- vault:
|
||||
@ -55,9 +39,7 @@ tests:
|
||||
tests_options:
|
||||
policyd:
|
||||
service: openstack-dashboard
|
||||
force_deploy:
|
||||
- groovy-victoria
|
||||
- impish-xena
|
||||
force_deploy: []
|
||||
|
||||
target_deploy_status:
|
||||
vault:
|
||||
|
||||
34
tox.ini
34
tox.ini
@ -37,12 +37,22 @@ setenv = VIRTUAL_ENV={envdir}
|
||||
install_command =
|
||||
{toxinidir}/pip.sh install {opts} {packages}
|
||||
commands = stestr run --slowest {posargs}
|
||||
allowlist_externals = juju
|
||||
allowlist_externals =
|
||||
charmcraft
|
||||
rename.sh
|
||||
passenv = HOME TERM CS_* OS_* TEST_*
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
|
||||
[testenv:py35]
|
||||
basepython = python3.5
|
||||
[testenv:build]
|
||||
basepython = python3
|
||||
deps = -r{toxinidir}/build-requirements.txt
|
||||
commands =
|
||||
charmcraft clean
|
||||
charmcraft -v build
|
||||
{toxinidir}/rename.sh
|
||||
|
||||
[testenv:py3]
|
||||
basepython = python3
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
|
||||
@ -50,21 +60,25 @@ deps = -r{toxinidir}/requirements.txt
|
||||
basepython = python3.6
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
|
||||
[testenv:py37]
|
||||
basepython = python3.7
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
commands = stestr run --slowest {posargs}
|
||||
|
||||
[testenv:py38]
|
||||
basepython = python3.8
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
commands = stestr run --slowest {posargs}
|
||||
|
||||
[testenv:py3]
|
||||
basepython = python3
|
||||
[testenv:py39]
|
||||
basepython = python3.9
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
commands = stestr run --slowest {posargs}
|
||||
|
||||
[testenv:py310]
|
||||
basepython = python3.10
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
commands = stestr run --slowest {posargs}
|
||||
|
||||
[testenv:pep8]
|
||||
basepython = python3
|
||||
|
||||
Loading…
Reference in New Issue
Block a user