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: Iac8b3e81fbee08cb03d8e2c93e8e6b17f187b021
This commit is contained in:
Alex Kavanagh
parent
f0a5668af6
commit
db0b01d8cd
|
|
@ -3,3 +3,4 @@
|
|||
*__pycache__*
|
||||
*.pyc
|
||||
build
|
||||
*.charm
|
||||
|
|
|
|||
|
|
@ -3,4 +3,4 @@ host=review.opendev.org
|
|||
port=29418
|
||||
project=openstack/charm-barbican-vault.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
|
||||
|
|
|
|||
|
|
@ -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,30 @@
|
|||
type: charm
|
||||
|
||||
parts:
|
||||
charm:
|
||||
build-packages:
|
||||
- tox
|
||||
- git
|
||||
- python3-dev
|
||||
override-build: |
|
||||
apt-get install ca-certificates -y
|
||||
tox -e build-reactive
|
||||
override-stage: |
|
||||
echo "Copying charm to staging area: $CHARMCRAFT_STAGE"
|
||||
NAME=$(ls $CHARMCRAFT_PART_BUILD/build/builds)
|
||||
cp -r $CHARMCRAFT_PART_BUILD/build/builds/$NAME/* $CHARMCRAFT_STAGE/
|
||||
override-prime: |
|
||||
# For some reason, the normal priming chokes on the fact that there's a
|
||||
# hooks directory.
|
||||
cp -r $CHARMCRAFT_STAGE/* .
|
||||
|
||||
bases:
|
||||
- build-on:
|
||||
- name: ubuntu
|
||||
channel: "20.04"
|
||||
architectures:
|
||||
- amd64
|
||||
run-on:
|
||||
- name: ubuntu
|
||||
channel: "20.04"
|
||||
architectures: [amd64, s390x, ppc64el, arm64]
|
||||
|
|
@ -0,0 +1 @@
|
|||
src/metadata.yaml
|
||||
22
osci.yaml
22
osci.yaml
|
|
@ -1,23 +1,9 @@
|
|||
- project:
|
||||
templates:
|
||||
- charm-unit-jobs
|
||||
# using overridden, shorter functional list because the charm does
|
||||
# already in the tests.yaml
|
||||
# - charm-functional-jobs
|
||||
check:
|
||||
jobs:
|
||||
- impish-xena:
|
||||
voting: false
|
||||
- hirsute-wallaby
|
||||
- focal-xena:
|
||||
voting: false
|
||||
- groovy-victoria
|
||||
- focal-wallaby
|
||||
- focal-victoria
|
||||
- focal-ussuri
|
||||
- bionic-ussuri
|
||||
- bionic-train
|
||||
- bionic-stein
|
||||
- charm-unit-jobs-py38
|
||||
- charm-focal-ussuri-functional-jobs
|
||||
- charm-victoria-functional-jobs
|
||||
vars:
|
||||
needs_charm_build: true
|
||||
charm_build_name: barbican-vault
|
||||
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
|
||||
|
|
@ -6,6 +6,7 @@
|
|||
# NOTE(lourot): This might look like a duplication of test-requirements.txt but
|
||||
# some tox targets use only test-requirements.txt whereas charm-build uses only
|
||||
# requirements.txt
|
||||
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
|
||||
|
||||
|
|
|
|||
|
|
@ -142,17 +142,11 @@
|
|||
"vcs": null,
|
||||
"version": "1.1.1"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "Tempita",
|
||||
"vcs": null,
|
||||
"version": "0.4"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "charms.openstack",
|
||||
"url": "git+https://github.com/openstack/charms.openstack.git",
|
||||
"branch": "refs/heads/stable/21.10",
|
||||
"branch": "stable/victoria",
|
||||
"version": "10627ee5f991c268f174d6d100e218a0e1867af1",
|
||||
"vcs": "git"
|
||||
},
|
||||
|
|
@ -184,8 +178,8 @@
|
|||
"type": "python_module",
|
||||
"package": "charmhelpers",
|
||||
"url": "git+https://github.com/juju/charm-helpers.git",
|
||||
"branch": "refs/heads/stable/21.10",
|
||||
"version": "26efcd0da51d580f68ead2ca13c38f58766f8a14",
|
||||
"branch": "stable/victoria",
|
||||
"version": "df2e33ed634200de1d02d7e5f1baaf80f22a6315",
|
||||
"vcs": "git"
|
||||
},
|
||||
{
|
||||
|
|
@ -213,4 +207,4 @@
|
|||
"version": "1.26.7"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
@ -5,11 +5,7 @@ description: Vault backend for OpenStack Barbican
|
|||
tags:
|
||||
- openstack
|
||||
series:
|
||||
- bionic
|
||||
- focal
|
||||
- groovy
|
||||
- hirsute
|
||||
- impish
|
||||
subordinate: true
|
||||
provides:
|
||||
secrets:
|
||||
|
|
|
|||
|
|
@ -5,5 +5,9 @@
|
|||
#
|
||||
|
||||
# Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
|
||||
git+https://github.com/openstack-charmers/zaza.git@stable/21.10#egg=zaza
|
||||
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.10#egg=zaza.openstack
|
||||
git+https://github.com/openstack-charmers/zaza.git@stable/victoria#egg=zaza
|
||||
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/victoria#egg=zaza.openstack
|
||||
|
||||
# Need tox to be available from tox... inception yes, but its a workaround for now
|
||||
tox
|
||||
|
||||
|
|
|
|||
|
|
@ -1,41 +0,0 @@
|
|||
series: bionic
|
||||
relations:
|
||||
- - mysql:shared-db
|
||||
- keystone:shared-db
|
||||
- - mysql:shared-db
|
||||
- vault:shared-db
|
||||
- - mysql:shared-db
|
||||
- barbican:shared-db
|
||||
- - keystone:identity-service
|
||||
- barbican:identity-service
|
||||
- - rabbitmq-server:amqp
|
||||
- barbican:amqp
|
||||
- - barbican-vault:secrets
|
||||
- barbican:secrets
|
||||
- - vault:secrets
|
||||
- barbican-vault:secrets-storage
|
||||
applications:
|
||||
mysql:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-rocky
|
||||
barbican:
|
||||
series: bionic
|
||||
charm: cs:~openstack-charmers/barbican
|
||||
num_units: 3
|
||||
options:
|
||||
openstack-origin: cloud:bionic-rocky
|
||||
barbican-vault:
|
||||
series: bionic
|
||||
charm: ../../../barbican-vault
|
||||
num_units: 0
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
vault:
|
||||
charm: cs:~openstack-charmers/vault
|
||||
num_units: 1
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
series: bionic
|
||||
relations:
|
||||
- - mysql:shared-db
|
||||
- keystone:shared-db
|
||||
- - mysql:shared-db
|
||||
- vault:shared-db
|
||||
- - mysql:shared-db
|
||||
- barbican:shared-db
|
||||
- - keystone:identity-service
|
||||
- barbican:identity-service
|
||||
- - rabbitmq-server:amqp
|
||||
- barbican:amqp
|
||||
- - barbican-vault:secrets
|
||||
- barbican:secrets
|
||||
- - vault:secrets
|
||||
- barbican-vault:secrets-storage
|
||||
applications:
|
||||
mysql:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-stein
|
||||
barbican:
|
||||
series: bionic
|
||||
charm: cs:~openstack-charmers/barbican
|
||||
num_units: 3
|
||||
options:
|
||||
openstack-origin: cloud:bionic-stein
|
||||
barbican-vault:
|
||||
series: bionic
|
||||
charm: ../../../barbican-vault
|
||||
num_units: 0
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
vault:
|
||||
charm: cs:~openstack-charmers/vault
|
||||
num_units: 1
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
series: bionic
|
||||
relations:
|
||||
- - mysql:shared-db
|
||||
- keystone:shared-db
|
||||
- - mysql:shared-db
|
||||
- vault:shared-db
|
||||
- - mysql:shared-db
|
||||
- barbican:shared-db
|
||||
- - keystone:identity-service
|
||||
- barbican:identity-service
|
||||
- - rabbitmq-server:amqp
|
||||
- barbican:amqp
|
||||
- - barbican-vault:secrets
|
||||
- barbican:secrets
|
||||
- - vault:secrets
|
||||
- barbican-vault:secrets-storage
|
||||
applications:
|
||||
mysql:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-train
|
||||
barbican:
|
||||
series: bionic
|
||||
charm: cs:~openstack-charmers/barbican
|
||||
num_units: 3
|
||||
options:
|
||||
openstack-origin: cloud:bionic-train
|
||||
barbican-vault:
|
||||
series: bionic
|
||||
charm: ../../../barbican-vault
|
||||
num_units: 0
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
vault:
|
||||
charm: cs:~openstack-charmers/vault
|
||||
num_units: 1
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
series: bionic
|
||||
relations:
|
||||
- - mysql:shared-db
|
||||
- keystone:shared-db
|
||||
- - mysql:shared-db
|
||||
- vault:shared-db
|
||||
- - mysql:shared-db
|
||||
- barbican:shared-db
|
||||
- - keystone:identity-service
|
||||
- barbican:identity-service
|
||||
- - rabbitmq-server:amqp
|
||||
- barbican:amqp
|
||||
- - barbican-vault:secrets
|
||||
- barbican:secrets
|
||||
- - vault:secrets
|
||||
- barbican-vault:secrets-storage
|
||||
applications:
|
||||
mysql:
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-ussuri
|
||||
barbican:
|
||||
charm: cs:~openstack-charmers/barbican
|
||||
num_units: 3
|
||||
options:
|
||||
openstack-origin: cloud:bionic-ussuri
|
||||
barbican-vault:
|
||||
charm: ../../../barbican-vault
|
||||
num_units: 0
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
vault:
|
||||
charm: cs:~openstack-charmers/vault
|
||||
num_units: 1
|
||||
|
|
@ -1,3 +1,5 @@
|
|||
local_overlay_enabled: False
|
||||
|
||||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
|
|
@ -22,14 +24,17 @@ machines:
|
|||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
charm: ch:mysql-router
|
||||
channel: 8.0.19/stable
|
||||
vault-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
charm: ch:mysql-router
|
||||
channel: 8.0.19/stable
|
||||
barbican-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
|
||||
|
|
@ -37,17 +42,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
|
||||
|
||||
barbican:
|
||||
charm: cs:~openstack-charmers/barbican
|
||||
charm: ch:barbican
|
||||
num_units: 3
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
|
@ -55,24 +62,27 @@ applications:
|
|||
- '4'
|
||||
- '5'
|
||||
- '6'
|
||||
channel: victoria/edge
|
||||
|
||||
barbican-vault:
|
||||
charm: ../../../barbican-vault
|
||||
charm: ../../../barbican-vault.charm
|
||||
num_units: 0
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '7'
|
||||
channel: 3.8/edge
|
||||
|
||||
vault:
|
||||
charm: cs:~openstack-charmers/vault
|
||||
charm: ch:vault
|
||||
num_units: 1
|
||||
to:
|
||||
- '8'
|
||||
channel: 1.7/stable
|
||||
|
||||
relations:
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
local_overlay_enabled: False
|
||||
|
||||
variables:
|
||||
openstack-origin: &openstack-origin cloud:focal-victoria
|
||||
|
||||
|
|
@ -22,14 +24,17 @@ machines:
|
|||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
charm: ch:mysql-router
|
||||
channel: 8.0.19/stable
|
||||
vault-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
charm: ch:mysql-router
|
||||
channel: 8.0.19/stable
|
||||
barbican-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
|
||||
|
|
@ -37,17 +42,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
|
||||
|
||||
barbican:
|
||||
charm: cs:~openstack-charmers/barbican
|
||||
charm: ch:barbican
|
||||
num_units: 3
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
|
@ -55,24 +62,27 @@ applications:
|
|||
- '4'
|
||||
- '5'
|
||||
- '6'
|
||||
channel: victoria/edge
|
||||
|
||||
barbican-vault:
|
||||
charm: ../../../barbican-vault
|
||||
charm: ../../../barbican-vault.charm
|
||||
num_units: 0
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '7'
|
||||
channel: 3.8/edge
|
||||
|
||||
vault:
|
||||
charm: cs:~openstack-charmers/vault
|
||||
charm: ch:vault
|
||||
num_units: 1
|
||||
to:
|
||||
- '8'
|
||||
channel: 1.7/stable
|
||||
|
||||
relations:
|
||||
|
||||
|
|
|
|||
|
|
@ -1,104 +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':
|
||||
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
vault-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
barbican-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'
|
||||
|
||||
barbican:
|
||||
charm: cs:~openstack-charmers/barbican
|
||||
num_units: 3
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
- '5'
|
||||
- '6'
|
||||
|
||||
barbican-vault:
|
||||
charm: ../../../barbican-vault
|
||||
num_units: 0
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '7'
|
||||
|
||||
vault:
|
||||
charm: cs:~openstack-charmers/vault
|
||||
num_units: 1
|
||||
to:
|
||||
- '8'
|
||||
|
||||
relations:
|
||||
|
||||
- - 'keystone:shared-db'
|
||||
- 'keystone-mysql-router:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'vault:shared-db'
|
||||
- 'vault-mysql-router:shared-db'
|
||||
- - 'vault-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'barbican:shared-db'
|
||||
- 'barbican-mysql-router:shared-db'
|
||||
- - 'barbican-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'keystone:identity-service'
|
||||
- 'barbican:identity-service'
|
||||
|
||||
- - 'rabbitmq-server:amqp'
|
||||
- 'barbican:amqp'
|
||||
|
||||
- - 'barbican-vault:secrets'
|
||||
- 'barbican:secrets'
|
||||
|
||||
- - 'vault:secrets'
|
||||
- 'barbican-vault:secrets-storage'
|
||||
|
|
@ -1,104 +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':
|
||||
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
vault-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
barbican-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'
|
||||
|
||||
barbican:
|
||||
charm: cs:~openstack-charmers/barbican
|
||||
num_units: 3
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
- '5'
|
||||
- '6'
|
||||
|
||||
barbican-vault:
|
||||
charm: ../../../barbican-vault
|
||||
num_units: 0
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '7'
|
||||
|
||||
vault:
|
||||
charm: cs:~openstack-charmers/vault
|
||||
num_units: 1
|
||||
to:
|
||||
- '8'
|
||||
|
||||
relations:
|
||||
|
||||
- - 'keystone:shared-db'
|
||||
- 'keystone-mysql-router:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'vault:shared-db'
|
||||
- 'vault-mysql-router:shared-db'
|
||||
- - 'vault-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'barbican:shared-db'
|
||||
- 'barbican-mysql-router:shared-db'
|
||||
- - 'barbican-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'keystone:identity-service'
|
||||
- 'barbican:identity-service'
|
||||
|
||||
- - 'rabbitmq-server:amqp'
|
||||
- 'barbican:amqp'
|
||||
|
||||
- - 'barbican-vault:secrets'
|
||||
- 'barbican:secrets'
|
||||
|
||||
- - 'vault:secrets'
|
||||
- 'barbican-vault:secrets-storage'
|
||||
|
|
@ -1,104 +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':
|
||||
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
vault-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
barbican-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'
|
||||
|
||||
barbican:
|
||||
charm: cs:~openstack-charmers/barbican
|
||||
num_units: 3
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
- '5'
|
||||
- '6'
|
||||
|
||||
barbican-vault:
|
||||
charm: ../../../barbican-vault
|
||||
num_units: 0
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '7'
|
||||
|
||||
vault:
|
||||
charm: cs:~openstack-charmers/vault
|
||||
num_units: 1
|
||||
to:
|
||||
- '8'
|
||||
|
||||
relations:
|
||||
|
||||
- - 'keystone:shared-db'
|
||||
- 'keystone-mysql-router:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'vault:shared-db'
|
||||
- 'vault-mysql-router:shared-db'
|
||||
- - 'vault-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'barbican:shared-db'
|
||||
- 'barbican-mysql-router:shared-db'
|
||||
- - 'barbican-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'keystone:identity-service'
|
||||
- 'barbican:identity-service'
|
||||
|
||||
- - 'rabbitmq-server:amqp'
|
||||
- 'barbican:amqp'
|
||||
|
||||
- - 'barbican-vault:secrets'
|
||||
- 'barbican:secrets'
|
||||
|
||||
- - 'vault:secrets'
|
||||
- 'barbican-vault:secrets-storage'
|
||||
|
|
@ -1,104 +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':
|
||||
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
vault-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
barbican-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'
|
||||
|
||||
barbican:
|
||||
charm: cs:~openstack-charmers/barbican
|
||||
num_units: 3
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
- '5'
|
||||
- '6'
|
||||
|
||||
barbican-vault:
|
||||
charm: ../../../barbican-vault
|
||||
num_units: 0
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '7'
|
||||
|
||||
vault:
|
||||
charm: cs:~openstack-charmers/vault
|
||||
num_units: 1
|
||||
to:
|
||||
- '8'
|
||||
|
||||
relations:
|
||||
|
||||
- - 'keystone:shared-db'
|
||||
- 'keystone-mysql-router:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'vault:shared-db'
|
||||
- 'vault-mysql-router:shared-db'
|
||||
- - 'vault-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'barbican:shared-db'
|
||||
- 'barbican-mysql-router:shared-db'
|
||||
- - 'barbican-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'keystone:identity-service'
|
||||
- 'barbican:identity-service'
|
||||
|
||||
- - 'rabbitmq-server:amqp'
|
||||
- 'barbican:amqp'
|
||||
|
||||
- - 'barbican-vault:secrets'
|
||||
- 'barbican:secrets'
|
||||
|
||||
- - 'vault:secrets'
|
||||
- 'barbican-vault:secrets-storage'
|
||||
|
|
@ -1,104 +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':
|
||||
|
||||
applications:
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
vault-mysql-router:
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
barbican-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'
|
||||
|
||||
barbican:
|
||||
charm: cs:~openstack-charmers/barbican
|
||||
num_units: 3
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
- '5'
|
||||
- '6'
|
||||
|
||||
barbican-vault:
|
||||
charm: ../../../barbican-vault
|
||||
num_units: 0
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '7'
|
||||
|
||||
vault:
|
||||
charm: cs:~openstack-charmers/vault
|
||||
num_units: 1
|
||||
to:
|
||||
- '8'
|
||||
|
||||
relations:
|
||||
|
||||
- - 'keystone:shared-db'
|
||||
- 'keystone-mysql-router:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'vault:shared-db'
|
||||
- 'vault-mysql-router:shared-db'
|
||||
- - 'vault-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'barbican:shared-db'
|
||||
- 'barbican-mysql-router:shared-db'
|
||||
- - 'barbican-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'keystone:identity-service'
|
||||
- 'barbican:identity-service'
|
||||
|
||||
- - 'rabbitmq-server:amqp'
|
||||
- 'barbican:amqp'
|
||||
|
||||
- - 'barbican-vault:secrets'
|
||||
- 'barbican:secrets'
|
||||
|
||||
- - 'vault:secrets'
|
||||
- 'barbican-vault:secrets-storage'
|
||||
|
|
@ -3,7 +3,8 @@ applications:
|
|||
options:
|
||||
vip: '{{ TEST_VIP01 }}'
|
||||
barbican-hacluster:
|
||||
charm: cs:~openstack-charmers/hacluster
|
||||
charm: ch:hacluster
|
||||
channel: 2.0.3/stable
|
||||
relations:
|
||||
- - barbican:ha
|
||||
- barbican-hacluster:ha
|
||||
|
|
|
|||
|
|
@ -2,18 +2,9 @@ charm_name: barbican-vault
|
|||
smoke_bundles:
|
||||
- focal-ussuri
|
||||
gate_bundles:
|
||||
- groovy-victoria
|
||||
- focal-xena
|
||||
- focal-wallaby
|
||||
- focal-victoria
|
||||
- focal-ussuri
|
||||
- bionic-ussuri
|
||||
- bionic-train
|
||||
- bionic-stein
|
||||
dev_bundles:
|
||||
- impish-xena
|
||||
- hirsute-wallaby
|
||||
- bionic-rocky
|
||||
dev_bundles: []
|
||||
target_deploy_status:
|
||||
barbican-vault:
|
||||
workload-status: waiting
|
||||
|
|
@ -26,7 +17,4 @@ configure:
|
|||
tests:
|
||||
- zaza.openstack.charm_tests.barbican_vault.tests.BarbicanVaultUnsealVault
|
||||
tests_options:
|
||||
force_deploy:
|
||||
- hirsute-wallaby
|
||||
- groovy-victoria
|
||||
- impish-xena
|
||||
force_deploy: []
|
||||
|
|
|
|||
|
|
@ -3,6 +3,6 @@ hvac==0.10.1
|
|||
requests==2.25.1 # for py35 support
|
||||
idna<3.0 # for py35 support
|
||||
|
||||
git+https://github.com/openstack/charms.openstack.git@stable/21.10#egg=charms.openstack
|
||||
git+https://github.com/openstack/charms.openstack.git@stable/victoria#egg=charms.openstack
|
||||
|
||||
git+https://github.com/juju/charm-helpers.git@stable/21.10#egg=charmhelpers
|
||||
git+https://github.com/juju/charm-helpers@stable/victoria#egg=charmhelpers
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
# choices of *requirements.txt files for OpenStack Charms:
|
||||
# https://github.com/openstack-charmers/release-tools
|
||||
#
|
||||
pyparsing<3.0.0 # cffi needs pyparsing < 3.0.0.
|
||||
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
|
||||
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
||||
|
||||
|
|
@ -34,7 +35,7 @@ mock>=1.2; python_version >= '3.6'
|
|||
|
||||
nose>=1.3.7
|
||||
coverage>=3.6
|
||||
git+https://github.com/openstack/charms.openstack.git@stable/21.10#egg=charms.openstack
|
||||
git+https://github.com/openstack/charms.openstack.git@stable/victoria#egg=charms.openstack
|
||||
#
|
||||
# Revisit for removal / mock improvement:
|
||||
#
|
||||
|
|
|
|||
45
tox.ini
45
tox.ini
|
|
@ -37,11 +37,24 @@ setenv = VIRTUAL_ENV={envdir}
|
|||
passenv = http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY
|
||||
install_command =
|
||||
{toxinidir}/pip.sh install {opts} {packages}
|
||||
allowlist_externals =
|
||||
charmcraft
|
||||
bash
|
||||
tox
|
||||
rename.sh
|
||||
deps =
|
||||
-r{toxinidir}/requirements.txt
|
||||
|
||||
[testenv:build]
|
||||
basepython = python3
|
||||
deps = -r{toxinidir}/build-requirements.txt
|
||||
commands =
|
||||
charmcraft clean
|
||||
charmcraft -v build
|
||||
{toxinidir}/rename.sh
|
||||
|
||||
[testenv:build-reactive]
|
||||
basepython = python3
|
||||
commands =
|
||||
charm-build --log-level DEBUG --use-lock-file-branches -o {toxinidir}/build/builds src {posargs}
|
||||
|
||||
|
|
@ -55,32 +68,44 @@ basepython = python3
|
|||
deps = -r{toxinidir}/test-requirements.txt
|
||||
commands = stestr run --slowest {posargs}
|
||||
|
||||
[testenv:py35]
|
||||
basepython = python3.5
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
commands = stestr run --slowest {posargs}
|
||||
|
||||
[testenv:py36]
|
||||
basepython = python3.6
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
commands = stestr run --slowest {posargs}
|
||||
|
||||
[testenv:py37]
|
||||
basepython = python3.7
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
commands = stestr run --slowest {posargs}
|
||||
|
||||
[testenv:py38]
|
||||
basepython = python3.8
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
commands = stestr run --slowest {posargs}
|
||||
|
||||
[testenv:py39]
|
||||
basepython = python3.9
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
commands = stestr run --slowest {posargs}
|
||||
|
||||
[testenv:py310]
|
||||
basepython = python3.10
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
commands = stestr run --slowest {posargs}
|
||||
|
||||
[testenv:pep8]
|
||||
basepython = python3
|
||||
deps = flake8==3.9.2
|
||||
charm-tools==2.8.3
|
||||
commands = flake8 {posargs} src unit_tests
|
||||
|
||||
[testenv:func-target]
|
||||
# Hack to get functional tests working in the charmcraft
|
||||
# world. We should fix this.
|
||||
basepython = python3
|
||||
passenv = HOME TERM CS_* OS_* TEST_*
|
||||
deps = -r{toxinidir}/src/test-requirements.txt
|
||||
changedir = {toxinidir}/src
|
||||
commands =
|
||||
bash -c "if [ ! -f ../*.charm ]; then echo 'Charm does not exist. Run tox -e build'; exit 1; fi"
|
||||
tox --version
|
||||
tox -e func-target {posargs}
|
||||
|
||||
[testenv:cover]
|
||||
# Technique based heavily upon
|
||||
# https://github.com/openstack/nova/blob/master/tox.ini
|
||||
|
|
|
|||
Loading…
Reference in New Issue