openstack/charm-vault
Code Issues Proposed changes

Add charmcraft 3 support

Browse Source 
Update the charmcraft.yaml file to use base and platforms, only
allowing noble support.

- Update osci.yaml to use the charmcraft 3.x/beta
- Drop non-noble tests

Change-Id: Ied2b97aaf399593af2faee43753e9eaf1d1b1df6
This commit is contained in:
Felipe Reyes
2024-06-25 21:22:31 -04:00
committed by Billy Olsen
parent 71eadd2a9d
commit c91c6b0bb1
9 changed files with 39 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
charmcraft.yaml
View File

@@ -8,7 +8,7 @@ parts:
- --binary-wheels-from-source - --binary-wheels-from-source
- --verbose - --verbose
build-snaps: build-snaps:
- charm - charm/latest/edge
build-packages: build-packages:
- libpq-dev - libpq-dev
- libpython3-dev - libpython3-dev
@@ -16,68 +16,17 @@ parts:
- CHARM_INTERFACES_DIR: /root/project/interfaces/ - CHARM_INTERFACES_DIR: /root/project/interfaces/
- CHARM_LAYERS_DIR: /root/project/layers/ - CHARM_LAYERS_DIR: /root/project/layers/
bases: base: ubuntu@24.04
- build-on: platforms:
- name: ubuntu amd64:
channel: "22.04" build-on: amd64
architectures: [amd64] build-for: amd64
run-on: arm64:
- name: ubuntu build-on: arm64
channel: "22.04" build-for: arm64
architectures: [amd64] ppc64el:
- build-on: build-on: ppc64el
- name: ubuntu build-for: ppc64el
channel: "22.04" s390x:
architectures: [s390x] build-on: s390x
run-on: build-for: s390x
- name: ubuntu
channel: "22.04"
architectures: [s390x]
- build-on:
- name: ubuntu
channel: "22.04"
architectures: [ppc64el]
run-on:
- name: ubuntu
channel: "22.04"
architectures: [ppc64el]
- build-on:
- name: ubuntu
channel: "22.04"
architectures: [arm64]
run-on:
- name: ubuntu
channel: "22.04"
architectures: [arm64]
- build-on:
- name: ubuntu
channel: "23.10"
architectures: [amd64]
run-on:
- name: ubuntu
channel: "23.10"
architectures: [amd64]
- build-on:
- name: ubuntu
channel: "23.10"
architectures: [s390x]
run-on:
- name: ubuntu
channel: "23.10"
architectures: [s390x]
- build-on:
- name: ubuntu
channel: "23.10"
architectures: [ppc64el]
run-on:
- name: ubuntu
channel: "23.10"
architectures: [ppc64el]
- build-on:
- name: ubuntu
channel: "23.10"
architectures: [arm64]
run-on:
- name: ubuntu
channel: "23.10"
architectures: [arm64]

51
osci.yaml
View File

@@ -3,23 +3,17 @@
- charm-unit-jobs-py310 - charm-unit-jobs-py310
check: check:
jobs: jobs:
- jammy-mysql8 - noble-mysql8
- jammy-raft - noble-raft
- jammy-raft-cluster - noble-raft-cluster
- mantic-mysql8:
voting: false
- mantic-raft:
voting: false
- mantic-raft-cluster:
voting: false
vars: vars:
needs_charm_build: true needs_charm_build: true
charm_build_name: vault charm_build_name: vault
build_type: charmcraft build_type: charmcraft
charmcraft_channel: 2.x/stable charmcraft_channel: 3.x/beta
- job: - job:
name: jammy-mysql8 name: noble-mysql8
parent: func-target parent: func-target
dependencies: dependencies:
- osci-lint - osci-lint
@@ -27,40 +21,19 @@
soft: True soft: True
- charm-build - charm-build
vars: vars:
tox_extra_args: '-- jammy-mysql8' tox_extra_args: '-- noble-mysql8'
- job: - job:
name: jammy-raft name: noble-raft
parent: func-target parent: func-target
dependencies: dependencies:
- jammy-mysql8 - noble-mysql8
vars: vars:
tox_extra_args: '-- jammy-raft' tox_extra_args: '-- noble-raft'
- job: - job:
name: jammy-raft-cluster name: noble-raft-cluster
parent: func-target parent: func-target
dependencies: dependencies:
- jammy-mysql8 - noble-mysql8
vars: vars:
tox_extra_args: '-- jammy-raft-cluster' tox_extra_args: '-- noble-raft-cluster'
- job:
name: mantic-mysql8
parent: func-target
dependencies:
- jammy-mysql8
vars:
tox_extra_args: '-- mantic-mysql8'
- job:
name: mantic-raft
parent: func-target
dependencies:
- jammy-mysql8
vars:
tox_extra_args: '-- mantic-raft'
- job:
name: mantic-raft-cluster
parent: func-target
dependencies:
- jammy-mysql8
vars:
tox_extra_args: '-- mantic-raft-cluster'

107
src/tests/bundles/mantic-mysql8.yaml
View File

@@ -1,107 +0,0 @@
variables:
openstack-origin: &openstack-origin distro
local_overlay_enabled: False
series: mantic
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
vault-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_ubuntu-23.10-amd64.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:
- - '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'

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

@@ -1,102 +0,0 @@
variables:
openstack-origin: &openstack-origin distro
local_overlay_enabled: False
series: mantic
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_ubuntu-23.10-amd64.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/mantic-raft.yaml
View File

@@ -1,98 +0,0 @@
variables:
openstack-origin: &openstack-origin distro
local_overlay_enabled: False
series: mantic
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_ubuntu-23.10-amd64.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'

4
src/tests/bundles/jammy-mysql8.yaml → src/tests/bundles/noble-mysql8.yaml
View File

@@ -3,7 +3,7 @@ variables:
local_overlay_enabled: False local_overlay_enabled: False
series: jammy series: noble
comment: comment:
- 'machines section to decide order of deployment. database sooner = faster' - 'machines section to decide order of deployment. database sooner = faster'
@@ -45,7 +45,7 @@ applications:
vault: vault:
num_units: 1 num_units: 1
charm: ../../../vault_ubuntu-22.04-amd64.charm charm: ../../../vault_amd64.charm
to: to:
- '3' - '3'

4
src/tests/bundles/jammy-raft-cluster.yaml → src/tests/bundles/noble-raft-cluster.yaml
View File

@@ -3,7 +3,7 @@ variables:
local_overlay_enabled: False local_overlay_enabled: False
series: jammy series: noble
comment: comment:
- 'machines section to decide order of deployment. database sooner = faster' - 'machines section to decide order of deployment. database sooner = faster'
@@ -44,7 +44,7 @@ applications:
vault: vault:
num_units: 3 num_units: 3
charm: ../../../vault_ubuntu-22.04-amd64.charm charm: ../../../vault_amd64.charm
to: to:
- '3' - '3'
- '11' - '11'

4
src/tests/bundles/jammy-raft.yaml → src/tests/bundles/noble-raft.yaml
View File

@@ -3,7 +3,7 @@ variables:
local_overlay_enabled: False local_overlay_enabled: False
series: jammy series: noble
comment: comment:
- 'machines section to decide order of deployment. database sooner = faster' - 'machines section to decide order of deployment. database sooner = faster'
@@ -42,7 +42,7 @@ applications:
vault: vault:
num_units: 1 num_units: 1
charm: ../../../vault_ubuntu-22.04-amd64.charm charm: ../../../vault_amd64.charm
to: to:
- '3' - '3'

10
src/wheelhouse.txt
View File

@@ -1,21 +1,23 @@
netifaces netifaces
hvac<0.12.0 hvac<0.12.0
# for xenial support, tenacity 8.0.0+ drops support for py35 tenacity
tenacity<8.0.0
pbr pbr
# for lunar support, psycopg 2.9.5 adds support for py311 # for lunar support, psycopg 2.9.5 adds support for py311
psycopg2<2.9.5;python_version<'3.11' psycopg2<2.9.5;python_version<'3.11'
psycopg2>=2.9.5;python_version>='3.11' psycopg2>=2.9.5;python_version>='3.11'
# for xenial support, requests 2.26.0 drops support for py35 requests
requests<2.26.0
psutil psutil
git+https://github.com/wolsen/charms.reactive.git@fix-entry-points#egg=charms.reactive
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
git+https://github.com/juju/charm-helpers.git#egg=charmhelpers git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
git+https://github.com/wolsen/ops-reactive-interface.git@fix-endpoints#egg=ops_reactive_interface
loadbalancer-interface loadbalancer-interface
# Bug: https://github.com/canonical/operator/issues/517 # Bug: https://github.com/canonical/operator/issues/517