openstack/charm-vault
Code Issues Proposed changes

Re-enable cluster tests to osci.yaml

Browse Source 
Commit 0b7d041279 removed focal
tests and added jammy/kinetic tests in support of the Zed release.
The jammy/kinetic cluster tests weren't added to osci.yaml, so
they are added back in this change.

Remaining focal bundles are also dropped in this change.

Change-Id: Ic53d71bc7ddb25bc6735a2cfe36b78a5d8f30648
This commit is contained in:
Corey Bryant 2022-09-06 11:12:46 -04:00
parent 0b7d041279
commit d6789e7afd
3 changed files with 18 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
osci.yaml
View File

@ -5,9 +5,12 @@
jobs:
- jammy-mysql8
- jammy-raft
- jammy-raft-cluster
- kinetic-mysql8:
voting: false
- kinetic-raft:
voting: false
- kinetic-mysql8:
- kinetic-raft-cluster:
voting: false
vars:
needs_charm_build: true
@ -32,6 +35,13 @@
- jammy-mysql8
vars:
tox_extra_args: jammy-raft
- job:
name: jammy-raft-cluster
parent: func-target
dependencies:
- jammy-mysql8
vars:
tox_extra_args: jammy-raft-cluster
- job:
name: kinetic-mysql8
parent: func-target
@ -46,3 +56,10 @@
- jammy-mysql8
vars:
tox_extra_args: kinetic-raft
- job:
name: kinetic-raft-cluster
parent: func-target
dependencies:
- jammy-mysql8
vars:
tox_extra_args: kinetic-raft-cluster

102
src/tests/bundles/focal-raft-cluster.yaml
View File

@ -1,102 +0,0 @@
variables:
openstack-origin: &openstack-origin distro
local_overlay_enabled: False
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':
'9':
'10':
'11':
'12':
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
channel: latest/edge
vault:
num_units: 3
charm: ../../../vault.charm
to:
- '3'
- '11'
- '12'
keystone:
charm: ch:keystone
num_units: 1
options:
admin-password: openstack
openstack-origin: *openstack-origin
to:
- '4'
channel: latest/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 3
options:
source: *openstack-origin
to:
- '5'
- '6'
- '7'
channel: latest/edge
ceph-osd:
charm: ch: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'
channel: latest/edge
relations:
- - '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'

98
src/tests/bundles/focal-raft.yaml
View File

@ -1,98 +0,0 @@
variables:
openstack-origin: &openstack-origin distro
local_overlay_enabled: False
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':
'9':
'10':
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
channel: latest/edge
vault:
num_units: 1
charm: ../../../vault.charm
to:
- '3'
keystone:
charm: ch:keystone
num_units: 1
options:
admin-password: openstack
openstack-origin: *openstack-origin
to:
- '4'
channel: latest/edge
ceph-mon:
charm: ch:ceph-mon
num_units: 3
options:
source: *openstack-origin
to:
- '5'
- '6'
- '7'
channel: latest/edge
ceph-osd:
charm: ch: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'
channel: latest/edge
relations:
- - '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'