openstack/charm-vault
Code Issues Proposed changes

Migrate charm to charmhub latest/edge track

Browse Source 
Change-Id: I3614053d865b50310eac3657c86a561b136ff7df
This commit is contained in:
Alex Kavanagh 2022-01-27 18:04:50 +00:00
parent 485d41dd38
commit c9fad3c4f0
11 changed files with 58 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
charmcraft.yaml Normal file
View File

@ -0,0 +1,13 @@
type: charm
parts:
charm:
source: src/
plugin: reactive
build-snaps: [charm]
bases:
- name: ubuntu
channel: "20.04"
architectures:
- amd64

1
metadata.yaml Symbolic link
View File

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

35
osci.yaml
View File

@ -1,12 +1,10 @@
- project:
templates:
- charm-yoga-unit-jobs
- charm-unit-jobs-py38
- charm-unit-jobs-py39
check:
jobs:
- bionic-postgres
- bionic-mysql
- focal-mysql8
- hirsute-mysql8
- impish-mysql8:
voting: false
- jammy-mysql8:
@ -16,43 +14,26 @@
charm_build_name: vault
- job:
name: bionic-mysql
name: focal-mysql8
parent: func-target
dependencies:
- osci-lint
- tox-py36
- tox-py38
- tox-py39
vars:
tox_extra_args: bionic-mysql
- job:
name: bionic-postgres
parent: func-target
dependencies: &smoke-jobs
- bionic-mysql
vars:
tox_extra_args: bionic-postgres
- job:
name: focal-mysql8
parent: func-target
dependencies: *smoke-jobs
- charm-build
vars:
tox_extra_args: focal-mysql8
- job:
name: hirsute-mysql8
parent: func-target
dependencies: *smoke-jobs
vars:
tox_extra_args: hirsute-mysql8
- job:
name: impish-mysql8
parent: func-target
dependencies: *smoke-jobs
dependencies:
- focal-mysql8
vars:
tox_extra_args: impish-mysql8
- job:
name: jammy-mysql8
parent: func-target
dependencies: *smoke-jobs
dependencies:
- focal-mysql8
vars:
tox_extra_args: jammy-mysql8

3
src/metadata.yaml
View File

@ -12,10 +12,7 @@ description: |
credentials, SQL/NoSQL databases, X.509 certificates,
SSH credentials, and more.
series:
- bionic
- focal
- groovy
- hirsute
- impish
tags:
- security

40
src/tests/bundles/bionic-mysql.yaml
View File

@ -1,40 +0,0 @@
series: bionic
services:
vault:
num_units: 1
series: bionic
charm: vault
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
admin-password: openstack
openstack-origin: cloud:bionic-train
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
num_units: 3
options:
source: cloud:bionic-train
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
num_units: 3
options:
source: cloud:bionic-train
osd-encrypt: true
osd-encrypt-keymanager: vault
storage:
osd-devices: 10G,2
relations:
- - vault:shared-db
- mysql:shared-db
- - keystone:shared-db
- mysql:shared-db
- - vault:certificates
- keystone:certificates
- - vault:secrets
- ceph-osd:secrets-storage
- - ceph-mon:osd
- ceph-osd:mon

13
src/tests/bundles/bionic-postgres.yaml
View File

@ -1,13 +0,0 @@
series: bionic
services:
vault:
num_units: 1
series: bionic
charm: ../../../vault
postgresql:
series: xenial
charm: cs:postgresql
num_units: 1
relations:
- - vault:db
- postgresql:db

18
src/tests/bundles/focal-mysql8.yaml
View File

@ -24,12 +24,14 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@ -37,6 +39,7 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
vault:
num_units: 1
@ -45,16 +48,17 @@ applications:
- '3'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
num_units: 1
options:
admin-password: openstack
openstack-origin: *openstack-origin
to:
- '4'
channel: latest/edge
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: ch:ceph-mon
num_units: 3
options:
source: *openstack-origin
@ -62,9 +66,10 @@ applications:
- '5'
- '6'
- '7'
channel: latest/edge
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: ch:ceph-osd
num_units: 3
options:
osd-encrypt: true
@ -76,6 +81,7 @@ applications:
- '8'
- '9'
- '10'
channel: latest/edge
relations:
- - 'vault:shared-db'

99
src/tests/bundles/hirsute-mysql8.yaml
View File

@ -1,99 +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':
'9':
'10':
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
vault:
num_units: 1
charm: vault
to:
- '3'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
admin-password: openstack
openstack-origin: *openstack-origin
to:
- '4'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
num_units: 3
options:
source: *openstack-origin
to:
- '5'
- '6'
- '7'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
num_units: 3
options:
osd-encrypt: true
osd-encrypt-keymanager: vault
source: *openstack-origin
storage:
osd-devices: 10G,2
to:
- '8'
- '9'
- '10'
relations:
- - 'vault:shared-db'
- 'vault-mysql-router:shared-db'
- - 'vault-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'vault:certificates'
- 'keystone:certificates'
- - 'vault:secrets'
- 'ceph-osd:secrets-storage'
- - 'ceph-mon:osd'
- 'ceph-osd:mon'

18
src/tests/bundles/impish-mysql8.yaml
View File

@ -24,12 +24,14 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@ -37,6 +39,7 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
vault:
num_units: 1
@ -45,16 +48,17 @@ applications:
- '3'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
num_units: 1
options:
admin-password: openstack
openstack-origin: *openstack-origin
to:
- '4'
channel: latest/edge
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: ch:ceph-mon
num_units: 3
options:
source: *openstack-origin
@ -62,9 +66,10 @@ applications:
- '5'
- '6'
- '7'
channel: latest/edge
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: ch:ceph-osd
num_units: 3
options:
osd-encrypt: true
@ -76,6 +81,7 @@ applications:
- '8'
- '9'
- '10'
channel: latest/edge
relations:
- - 'vault:shared-db'

18
src/tests/bundles/jammy-mysql8.yaml
View File

@ -24,12 +24,14 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@ -37,6 +39,7 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
vault:
num_units: 1
@ -45,16 +48,17 @@ applications:
- '3'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
num_units: 1
options:
admin-password: openstack
openstack-origin: *openstack-origin
to:
- '4'
channel: latest/edge
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: ch:ceph-mon
num_units: 3
options:
source: *openstack-origin
@ -62,9 +66,10 @@ applications:
- '5'
- '6'
- '7'
channel: latest/edge
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: ch:ceph-osd
num_units: 3
options:
osd-encrypt: true
@ -76,6 +81,7 @@ applications:
- '8'
- '9'
- '10'
channel: latest/edge
relations:
- - 'vault:shared-db'

4
src/tests/tests.yaml
View File

@ -4,10 +4,7 @@ configure:
- zaza.openstack.charm_tests.vault.setup.basic_setup
gate_bundles:
- bionic-postgres
- bionic-mysql
- focal-mysql8
- hirsute-mysql8
- impish-mysql8
dev_bundles:
@ -42,6 +39,5 @@ tests:
tests_options:
force_deploy:
- hirsute-mysql8
- impish-mysql8
- jammy-mysql8