openstack
/
charm-hacluster
Code Issues Proposed changes

Migrate charm to charmhub latest/edge track 

Change-Id: I5a4bb25ab1a249b5a790695da1baaa32343db568
This commit is contained in:
Alex Kavanagh 2022-01-27 13:26:26 +00:00
parent e195794f39
commit 127d176b2b
17 changed files with 55 additions and 408 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
charmcraft.yaml Normal file
View File

@ -0,0 +1,27 @@
type: charm
parts:
charm:
plugin: dump
source: .
prime:
- actions/*
- files/*
- hooks/*
- lib/*
- templates/*
- actions.yaml
- config.yaml
- copyright
- hardening.yaml
- icon.svg
- LICENSE
- Makefile
- metadata.yaml
- README.md
bases:
- name: ubuntu
channel: "20.04"
architectures:
- amd64

3
metadata.yaml
View File

@ -7,10 +7,7 @@ description: |
tags:
- misc
series:
- bionic
- focal
- groovy
- hirsute
- impish
requires:
juju-info:

10
osci.yaml
View File

@ -1,10 +1,6 @@
- project:
templates:
- charm-yoga-unit-jobs
- charm-yoga-functional-jobs
- charm-unit-jobs-py38
- charm-unit-jobs-py39
- charm-xena-functional-jobs
- charm-wallaby-functional-jobs
- charm-victoria-functional-jobs
- charm-ussuri-functional-jobs
- charm-stein-functional-jobs
- charm-queens-functional-jobs
- charm-yoga-functional-jobs

31
tests/bundles/bionic-queens.yaml
View File

@ -1,31 +0,0 @@
series: bionic
machines:
'0':
'1':
'2':
'3':
relations:
- ['keystone:shared-db', 'percona-cluster:shared-db']
- ['hacluster:ha', 'keystone:ha']
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 3
options:
token-expiration: 60
to:
- '1'
- '2'
- '3'
hacluster:
charm: ../../../hacluster
subordinate-to:
- keystone

32
tests/bundles/bionic-rocky.yaml
View File

@ -1,32 +0,0 @@
series: bionic
machines:
'0':
'1':
'2':
'3':
relations:
- ['keystone:shared-db', 'percona-cluster:shared-db']
- ['hacluster:ha', 'keystone:ha']
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 3
options:
openstack-origin: cloud:bionic-rocky
token-expiration: 60
to:
- '1'
- '2'
- '3'
hacluster:
charm: ../../../hacluster
subordinate-to:
- keystone

32
tests/bundles/bionic-stein.yaml
View File

@ -1,32 +0,0 @@
series: bionic
machines:
'0':
'1':
'2':
'3':
relations:
- ['keystone:shared-db', 'percona-cluster:shared-db']
- ['hacluster:ha', 'keystone:ha']
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 3
options:
openstack-origin: cloud:bionic-stein
token-expiration: 60
to:
- '1'
- '2'
- '3'
hacluster:
charm: ../../../hacluster
subordinate-to:
- keystone

32
tests/bundles/bionic-train.yaml
View File

@ -1,32 +0,0 @@
series: bionic
machines:
'0':
'1':
'2':
'3':
relations:
- ['keystone:shared-db', 'percona-cluster:shared-db']
- ['hacluster:ha', 'keystone:ha']
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 3
options:
openstack-origin: cloud:bionic-train
token-expiration: 60
to:
- '1'
- '2'
- '3'
hacluster:
charm: ../../../hacluster
subordinate-to:
- keystone

32
tests/bundles/bionic-ussuri.yaml
View File

@ -1,32 +0,0 @@
series: bionic
machines:
'0':
'1':
'2':
'3':
relations:
- ['keystone:shared-db', 'percona-cluster:shared-db']
- ['hacluster:ha', 'keystone:ha']
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 3
options:
openstack-origin: cloud:bionic-ussuri
token-expiration: 60
to:
- '1'
- '2'
- '3'
hacluster:
charm: ../../../hacluster
subordinate-to:
- keystone

54
tests/bundles/focal-ussuri.yaml
View File

@ -1,54 +0,0 @@
variables:
openstack-origin: &openstack-origin distro
series: focal
machines:
'0':
constraints: mem=3072M
'1':
constraints: mem=3072M
'2':
constraints: mem=3072M
'3':
'4':
'5':
applications:
keystone-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'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 3
options:
token-expiration: 60
openstack-origin: *openstack-origin
to:
- '3'
- '4'
- '5'
hacluster:
charm: ../../../hacluster
subordinate-to:
- keystone
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'hacluster:ha'
- 'keystone:ha'
- - "keystone-mysql-router:db-router"
- "mysql-innodb-cluster:db-router"

54
tests/bundles/focal-victoria.yaml
View File

@ -1,54 +0,0 @@
variables:
openstack-origin: &openstack-origin cloud:focal-victoria
series: focal
machines:
'0':
constraints: mem=3072M
'1':
constraints: mem=3072M
'2':
constraints: mem=3072M
'3':
'4':
'5':
applications:
keystone-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'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 3
options:
token-expiration: 60
openstack-origin: *openstack-origin
to:
- '3'
- '4'
- '5'
hacluster:
charm: ../../../hacluster
subordinate-to:
- keystone
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'hacluster:ha'
- 'keystone:ha'
- - "keystone-mysql-router:db-router"
- "mysql-innodb-cluster:db-router"

54
tests/bundles/focal-wallaby.yaml
View File

@ -1,54 +0,0 @@
variables:
openstack-origin: &openstack-origin cloud:focal-wallaby
series: focal
machines:
'0':
constraints: mem=3072M
'1':
constraints: mem=3072M
'2':
constraints: mem=3072M
'3':
'4':
'5':
applications:
keystone-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'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 3
options:
token-expiration: 60
openstack-origin: *openstack-origin
to:
- '3'
- '4'
- '5'
hacluster:
charm: ../../../hacluster
subordinate-to:
- keystone
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'hacluster:ha'
- 'keystone:ha'
- - "keystone-mysql-router:db-router"
- "mysql-innodb-cluster:db-router"

9
tests/bundles/focal-xena.yaml
View File

@ -17,10 +17,11 @@ machines:
applications:
keystone-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
@ -28,9 +29,10 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
num_units: 3
options:
token-expiration: 60
@ -39,6 +41,7 @@ applications:
- '3'
- '4'
- '5'
channel: latest/edge
hacluster:
charm: ../../../hacluster

9
tests/bundles/focal-yoga.yaml
View File

@ -17,10 +17,11 @@ machines:
applications:
keystone-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
@ -28,9 +29,10 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
num_units: 3
options:
token-expiration: 60
@ -39,6 +41,7 @@ applications:
- '3'
- '4'
- '5'
channel: latest/edge
hacluster:
charm: ../../../hacluster

54
tests/bundles/hirsute-wallaby.yaml
View File

@ -1,54 +0,0 @@
variables:
openstack-origin: &openstack-origin distro
series: hirsute
machines:
'0':
constraints: mem=3072M
'1':
constraints: mem=3072M
'2':
constraints: mem=3072M
'3':
'4':
'5':
applications:
keystone-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'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 3
options:
token-expiration: 60
openstack-origin: *openstack-origin
to:
- '3'
- '4'
- '5'
hacluster:
charm: ../../../hacluster
subordinate-to:
- keystone
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'hacluster:ha'
- 'keystone:ha'
- - "keystone-mysql-router:db-router"
- "mysql-innodb-cluster:db-router"

9
tests/bundles/impish-xena.yaml
View File

@ -17,10 +17,11 @@ machines:
applications:
keystone-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
@ -28,9 +29,10 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
num_units: 3
options:
token-expiration: 60
@ -39,6 +41,7 @@ applications:
- '3'
- '4'
- '5'
channel: latest/edge
hacluster:
charm: ../../../hacluster

9
tests/bundles/jammy-yoga.yaml
View File

@ -17,10 +17,11 @@ machines:
applications:
keystone-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
@ -28,9 +29,10 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
num_units: 3
options:
token-expiration: 60
@ -39,6 +41,7 @@ applications:
- '3'
- '4'
- '5'
channel: latest/edge
hacluster:
charm: ../../../hacluster

12
tests/tests.yaml
View File

@ -1,22 +1,13 @@
charm_name: hacluster
smoke_bundles:
- focal-ussuri
- focal-xena
gate_bundles:
- bionic-queens
- bionic-stein
- bionic-ussuri
- focal-ussuri
- focal-victoria
- focal-wallaby
- focal-xena
- hirsute-wallaby
- impish-xena
dev_bundles:
- bionic-rocky
- bionic-train
- focal-yoga
- jammy-yoga
@ -32,6 +23,5 @@ tests_options:
principle-app-name: keystone
hacluster-charm-name: hacluster
force_deploy:
- hirsute-wallaby
- impish-xena
- jammy-yoga