Merge "Migrate charm to charmhub latest/edge track"

This commit is contained in:
Zuul 2022-01-28 22:45:18 +00:00 committed by Gerrit Code Review
commit bbd1addaf4
23 changed files with 90 additions and 668 deletions

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

View File

@ -10,10 +10,7 @@ tags:
extra-bindings:
public: # Only used to allow specifying a hostname for DNS-HA.
series:
- bionic
- focal
- groovy
- hirsute
- impish
provides:
nrpe-external-master:

View File

@ -1,47 +1,23 @@
- 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
check:
jobs:
- checklist-work-required-bionic-queens
# gr tests are disabled due to:
# https://bugs.launchpad.net/charm-openstack-dashboard/+bug/1951644
- bionic-train-gr:
voting: false
- focal-ussuri-gr:
voting: false
- jammy-yoga-gr:
voting: false
- job:
name: checklist-work-required-bionic-queens
parent: func-target
dependencies: &smoke-jobs
- bionic-ussuri
vars:
tox_extra_args: checklist-work-required:bionic-queens
- job:
name: bionic-train-gr
parent: func-target
dependencies: *smoke-jobs
vars:
tox_extra_args: vault:bionic-vault dashboard:bionic-queens-cmr-vault
- job:
name: focal-ussuri-gr
parent: func-target
dependencies: *smoke-jobs
vars:
tox_extra_args: vault:focal-vault dashboard:focal-ussuri-cmr-vault
- job:
name: jammy-yoga-gr
parent: func-target
dependencies: *smoke-jobs
dependencies:
- osci-lint
- tox-py38
- tox-py39
- charm-build
vars:
tox_extra_args: vault:jammy-vault dashboard:jammy-yoga-cmr-vault

View File

@ -1,47 +0,0 @@
series: bionic
comment:
- 'machines section to decide order of deployment. database sooner = faster'
- 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
machines:
'0':
constraints: virt-type=kvm mem=3072M
'1':
constraints: virt-type=kvm
'2':
constraints: virt-type=kvm mem=3072M
'3':
constraints: virt-type=kvm mem=3072M
'4':
constraints: virt-type=kvm mem=3072M
relations:
- ["keystone:shared-db", "mysql:shared-db"]
- ["openstack-dashboard:shared-db", "mysql:shared-db"]
- ["openstack-dashboard:identity-service", "keystone:identity-service"]
- ["openstack-dashboard:ha", "hacluster:ha"]
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
to:
- '1'
openstack-dashboard:
charm: ../../../openstack-dashboard
num_units: 3
to:
- '2'
- '3'
- '4'
hacluster:
charm: cs:~openstack-charmers-next/hacluster
options:
corosync_transport: unicast
cluster_count: 3

View File

@ -1,35 +0,0 @@
series: bionic
comment:
- 'machines section to decide order of deployment. database sooner = faster'
- 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
machines:
'0':
constraints: virt-type=kvm mem=3072M
'1':
constraints: virt-type=kvm
'2':
constraints: virt-type=kvm mem=3072M
relations:
- ["keystone:shared-db", "mysql:shared-db"]
- ["openstack-dashboard:shared-db", "mysql:shared-db"]
- ["openstack-dashboard:identity-service", "keystone:identity-service"]
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
to:
- '1'
openstack-dashboard:
charm: ../../../openstack-dashboard
num_units: 1
to:
- '2'

View File

@ -1,39 +0,0 @@
series: bionic
comment:
- 'machines section to decide order of deployment. database sooner = faster'
- 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
machines:
'0':
constraints: virt-type=kvm mem=3072M
'1':
constraints: virt-type=kvm
'2':
constraints: virt-type=kvm mem=3072M
relations:
- ["keystone:shared-db", "mysql:shared-db"]
- ["openstack-dashboard:shared-db", "mysql:shared-db"]
- ["openstack-dashboard:identity-service", "keystone:identity-service"]
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
to:
- '1'
openstack-dashboard:
charm: ../../../openstack-dashboard
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
to:
- '2'

View File

@ -1,39 +0,0 @@
series: bionic
comment:
- 'machines section to decide order of deployment. database sooner = faster'
- 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
machines:
'0':
constraints: virt-type=kvm mem=3072M
'1':
constraints: virt-type=kvm
'2':
constraints: virt-type=kvm mem=3072M
relations:
- ["keystone:shared-db", "mysql:shared-db"]
- ["openstack-dashboard:shared-db", "mysql:shared-db"]
- ["openstack-dashboard:identity-service", "keystone:identity-service"]
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-stein
to:
- '1'
openstack-dashboard:
charm: ../../../openstack-dashboard
num_units: 1
options:
openstack-origin: cloud:bionic-stein
to:
- '2'

View File

@ -1,39 +0,0 @@
series: bionic
comment:
- 'machines section to decide order of deployment. database sooner = faster'
- 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
machines:
'0':
constraints: virt-type=kvm mem=3072M
'1':
constraints: virt-type=kvm
'2':
constraints: virt-type=kvm mem=3072M
relations:
- ["keystone:shared-db", "mysql:shared-db"]
- ["openstack-dashboard:shared-db", "mysql:shared-db"]
- ["openstack-dashboard:identity-service", "keystone:identity-service"]
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-train
to:
- '1'
openstack-dashboard:
charm: ../../../openstack-dashboard
num_units: 1
options:
openstack-origin: cloud:bionic-train
to:
- '2'

View File

@ -1,39 +0,0 @@
series: bionic
comment:
- 'machines section to decide order of deployment. database sooner = faster'
- 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
machines:
'0':
constraints: virt-type=kvm mem=3072M
'1':
constraints: virt-type=kvm
'2':
constraints: virt-type=kvm mem=3072M
relations:
- ["keystone:shared-db", "mysql:shared-db"]
- ["openstack-dashboard:shared-db", "mysql:shared-db"]
- ["openstack-dashboard:identity-service", "keystone:identity-service"]
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-ussuri
to:
- '1'
openstack-dashboard:
charm: ../../../openstack-dashboard
num_units: 1
options:
openstack-origin: cloud:bionic-ussuri
to:
- '2'

View File

@ -1,13 +0,0 @@
series: bionic
local_overlay_enabled: false
services:
vault:
num_units: 1
series: bionic
charm: cs:~openstack-charmers-next/vault
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
relations:
- - vault:shared-db
- mysql:shared-db

View File

@ -1,62 +0,0 @@
series: focal
comment:
- 'machines section to decide order of deployment. database sooner = faster'
- 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
machines:
'0':
constraints: virt-type=kvm mem=3072M
'1':
constraints: virt-type=kvm mem=3072M
'2':
constraints: virt-type=kvm mem=3072M
'3':
constraints: virt-type=kvm mem=3072M
'4':
constraints: virt-type=kvm mem=3072M
'5':
constraints: virt-type=kvm mem=3072M
'6':
constraints: virt-type=kvm mem=3072M
relations:
- ["keystone:shared-db", "keystone-mysql-router:shared-db"]
- ["keystone-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
- ["openstack-dashboard:shared-db", "openstack-dashboard-mysql-router:shared-db"]
- ["openstack-dashboard-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
- ["openstack-dashboard:identity-service", "keystone:identity-service"]
- ["openstack-dashboard:ha", "hacluster:ha"]
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
openstack-dashboard-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: 1
to:
- '3'
openstack-dashboard:
charm: ../../../openstack-dashboard
num_units: 3
to:
- '4'
- '5'
- '6'
hacluster:
charm: cs:~openstack-charmers-next/hacluster
options:
corosync_transport: unicast
cluster_count: 3

View File

@ -1,69 +0,0 @@
variables:
openstack-origin: &openstack-origin distro
series: focal
comment:
- 'machines section to decide order of deployment. database sooner = faster'
- 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
machines:
'0':
constraints: virt-type=kvm mem=3072M
'1':
constraints: virt-type=kvm mem=3072M
'2':
constraints: virt-type=kvm mem=3072M
'3':
constraints: virt-type=kvm
'4':
constraints: virt-type=kvm mem=3072M
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
openstack-dashboard-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: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
openstack-dashboard:
charm: ../../../openstack-dashboard
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'openstack-dashboard:shared-db'
- 'openstack-dashboard-mysql-router:shared-db'
- - 'openstack-dashboard-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'openstack-dashboard:identity-service'
- 'keystone:identity-service'

View File

@ -10,7 +10,7 @@ machines:
'3':
services:
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: distro
@ -18,14 +18,17 @@ services:
- '0'
- '1'
- '2'
channel: latest/edge
vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
vault:
num_units: 1
series: bionic
charm: cs:~openstack-charmers-next/vault
charm: ch:vault
to:
- '4'
channel: latest/edge
relations:
- - vault:shared-db
- vault-mysql-router:shared-db

View File

@ -1,69 +0,0 @@
variables:
openstack-origin: &openstack-origin cloud:focal-victoria
series: focal
comment:
- 'machines section to decide order of deployment. database sooner = faster'
- 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
machines:
'0':
constraints: virt-type=kvm mem=3072M
'1':
constraints: virt-type=kvm mem=3072M
'2':
constraints: virt-type=kvm mem=3072M
'3':
constraints: virt-type=kvm
'4':
constraints: virt-type=kvm mem=3072M
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
openstack-dashboard-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: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
openstack-dashboard:
charm: ../../../openstack-dashboard
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'openstack-dashboard:shared-db'
- 'openstack-dashboard-mysql-router:shared-db'
- - 'openstack-dashboard-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'openstack-dashboard:identity-service'
- 'keystone:identity-service'

View File

@ -1,69 +0,0 @@
variables:
openstack-origin: &openstack-origin cloud:focal-wallaby
series: focal
comment:
- 'machines section to decide order of deployment. database sooner = faster'
- 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
machines:
'0':
constraints: virt-type=kvm mem=3072M
'1':
constraints: virt-type=kvm mem=3072M
'2':
constraints: virt-type=kvm mem=3072M
'3':
constraints: virt-type=kvm
'4':
constraints: virt-type=kvm mem=3072M
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
openstack-dashboard-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: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
openstack-dashboard:
charm: ../../../openstack-dashboard
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'openstack-dashboard:shared-db'
- 'openstack-dashboard-mysql-router:shared-db'
- - 'openstack-dashboard-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'openstack-dashboard:identity-service'
- 'keystone:identity-service'

View File

@ -22,12 +22,14 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
openstack-dashboard-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
@ -35,14 +37,16 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
channel: latest/edge
openstack-dashboard:
charm: ../../../openstack-dashboard

View File

@ -22,12 +22,14 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
openstack-dashboard-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
@ -35,14 +37,16 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
channel: latest/edge
openstack-dashboard:
charm: ../../../openstack-dashboard

View File

@ -1,69 +0,0 @@
variables:
openstack-origin: &openstack-origin distro
series: hirsute
comment:
- 'machines section to decide order of deployment. database sooner = faster'
- 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
machines:
'0':
constraints: virt-type=kvm mem=3072M
'1':
constraints: virt-type=kvm mem=3072M
'2':
constraints: virt-type=kvm mem=3072M
'3':
constraints: virt-type=kvm
'4':
constraints: virt-type=kvm mem=3072M
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
openstack-dashboard-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: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
openstack-dashboard:
charm: ../../../openstack-dashboard
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'openstack-dashboard:shared-db'
- 'openstack-dashboard-mysql-router:shared-db'
- - 'openstack-dashboard-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'openstack-dashboard:identity-service'
- 'keystone:identity-service'

View File

@ -22,12 +22,14 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
openstack-dashboard-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
@ -35,14 +37,16 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
channel: latest/edge
openstack-dashboard:
charm: ../../../openstack-dashboard

View File

@ -10,7 +10,7 @@ machines:
'3':
services:
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: distro
@ -18,14 +18,17 @@ services:
- '0'
- '1'
- '2'
channel: latest/edge
vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
vault:
num_units: 1
series: bionic
charm: cs:~openstack-charmers-next/vault
charm: ch:vault
to:
- '4'
channel: latest/edge
relations:
- - vault:shared-db
- vault-mysql-router:shared-db

View File

@ -30,12 +30,14 @@ relations:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
openstack-dashboard-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
@ -43,11 +45,13 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
num_units: 1
to:
- '3'
channel: latest/edge
openstack-dashboard:
charm: ../../../openstack-dashboard
num_units: 3
@ -56,7 +60,8 @@ applications:
- '5'
- '6'
hacluster:
charm: cs:~openstack-charmers-next/hacluster
charm: ch:hacluster
options:
corosync_transport: unicast
cluster_count: 3
channel: latest/edge

View File

@ -22,12 +22,14 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: ch:mysql-router
channel: latest/edge
openstack-dashboard-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
@ -35,14 +37,16 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
channel: latest/edge
openstack-dashboard:
charm: ../../../openstack-dashboard

View File

@ -4,28 +4,13 @@ comment:
- ''
smoke_bundles:
- focal-ussuri
- focal-xena
gate_bundles:
- checklist-work-required: bionic-queens
- bionic-stein
- bionic-ussuri
- focal-ussuri
- focal-ussuri-gr:
- vault: focal-vault
- dashboard: focal-ussuri-cmr-vault
- focal-victoria
- focal-wallaby
- focal-xena
- hirsute-wallaby
- impish-xena
dev_bundles:
- bionic-rocky
- bionic-train
- bionic-train-gr:
- vault: bionic-vault
- dashboard: bionic-queens-cmr-vault
- focal-yoga
- jammy-yoga
- jammy-yoga-gr:
@ -60,7 +45,6 @@ tests_options:
policyd:
service: openstack-dashboard
force_deploy:
- hirsute-wallaby
- impish-xena
- jammy-yoga