openstack
/
charm-openstack-dashboard
Code Issues Proposed changes

Add yoga bundles and release-tool syncs 

* charm-helpers sync for classic charms
* sync from release-tools
* switch to release-specific zosci functional tests
* run focal-ussuri as smoke tests
* remove trusty, xenial, and groovy metadata/tests
* drop py35 and add py39

Change-Id: Ie287d7462b5e2cfcb1f91f25117eb61d93f59a1f
This commit is contained in:
Corey Bryant 2021-10-29 17:00:42 -04:00
parent 1b72612b37
commit d94662f374
24 changed files with 364 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
charmhelpers/contrib/openstack/utils.py
View File

@ -1413,7 +1413,8 @@ def incomplete_relation_data(configs, required_interfaces):
for i in incomplete_relations}
def do_action_openstack_upgrade(package, upgrade_callback, configs):
def do_action_openstack_upgrade(package, upgrade_callback, configs,
force_upgrade=False):
"""Perform action-managed OpenStack upgrade.
Upgrades packages to the configured openstack-origin version and sets
@ -1427,12 +1428,13 @@ def do_action_openstack_upgrade(package, upgrade_callback, configs):
@param package: package name for determining if upgrade available
@param upgrade_callback: function callback to charm's upgrade function
@param configs: templating object derived from OSConfigRenderer class
@param force_upgrade: perform dist-upgrade regardless of new openstack
@return: True if upgrade successful; False if upgrade failed or skipped
"""
ret = False
if openstack_upgrade_available(package):
if openstack_upgrade_available(package) or force_upgrade:
if config('action-managed-upgrade'):
juju_log('Upgrading OpenStack release')
@ -2599,6 +2601,23 @@ def get_subordinate_release_packages(os_release, package_type='deb'):
return SubordinatePackages(install, purge)
def get_subordinate_services():
"""Iterate over subordinate relations and get service information.
In a similar fashion as with get_subordinate_release_packages(),
principle charms can retrieve a list of services advertised by their
subordinate charms. This is useful to know about subordinate services when
pausing, resuming or upgrading a principle unit.
:returns: Name of all services advertised by all subordinates
:rtype: Set[str]
"""
services = set()
for rdata in container_scoped_relation_get('services'):
services |= set(json.loads(rdata or '[]'))
return services
os_restart_on_change = partial(
pausable_restart_on_change,
can_restart_now_f=deferred_events.check_and_record_restart_request,

11
charmhelpers/contrib/storage/linux/ceph.py
View File

@ -294,7 +294,6 @@ class BasePool(object):
# NOTE: Do not perform initialization steps that require live data from
# a running cluster here. The *Pool classes may be used for validation.
self.service = service
self.nautilus_or_later = cmp_pkgrevno('ceph-common', '14.2.0') >= 0
self.op = op or {}
if op:
@ -341,7 +340,8 @@ class BasePool(object):
Do not add calls for a specific pool type here, those should go into
one of the pool specific classes.
"""
if self.nautilus_or_later:
nautilus_or_later = cmp_pkgrevno('ceph-common', '14.2.0') >= 0
if nautilus_or_later:
# Ensure we set the expected pool ratio
update_pool(
client=self.service,
@ -660,8 +660,9 @@ class ReplicatedPool(BasePool):
else:
self.pg_num = self.get_pgs(self.replicas, self.percent_data)
nautilus_or_later = cmp_pkgrevno('ceph-common', '14.2.0') >= 0
# Create it
if self.nautilus_or_later:
if nautilus_or_later:
cmd = [
'ceph', '--id', self.service, 'osd', 'pool', 'create',
'--pg-num-min={}'.format(
@ -745,9 +746,9 @@ class ErasurePool(BasePool):
k = int(erasure_profile['k'])
m = int(erasure_profile['m'])
pgs = self.get_pgs(k + m, self.percent_data)
self.nautilus_or_later = cmp_pkgrevno('ceph-common', '14.2.0') >= 0
nautilus_or_later = cmp_pkgrevno('ceph-common', '14.2.0') >= 0
# Create it
if self.nautilus_or_later:
if nautilus_or_later:
cmd = [
'ceph', '--id', self.service, 'osd', 'pool', 'create',
'--pg-num-min={}'.format(

1
charmhelpers/core/host_factory/ubuntu.py
View File

@ -29,6 +29,7 @@ UBUNTU_RELEASES = (
'groovy',
'hirsute',
'impish',
'jammy',
)

1
charmhelpers/fetch/ubuntu.py
View File

@ -275,6 +275,7 @@ UBUNTU_OPENSTACK_RELEASE = OrderedDict([
('groovy', 'victoria'),
('hirsute', 'wallaby'),
('impish', 'xena'),
('jammy', 'yoga'),
])

1
metadata.yaml
View File

@ -10,7 +10,6 @@ tags:
extra-bindings:
public: # Only used to allow specifying a hostname for DNS-HA.
series:
- xenial
- bionic
- focal
- groovy

48
osci.yaml
View File

@ -1,36 +1,30 @@
- project:
templates:
- charm-unit-jobs
- charm-yoga-unit-jobs
- charm-yoga-functional-jobs
- charm-xena-functional-jobs
- charm-wallaby-functional-jobs
- charm-victoria-functional-jobs
- charm-ussuri-functional-jobs
- charm-stein-functional-jobs
- charm-queens-functional-jobs
check:
jobs:
- bionic-train-gr
- checklist-work-required-xenial-mitaka
- checklist-work-required-bionic-queens
- bionic-rocky
- bionic-stein
- bionic-train
- bionic-ussuri
- focal-ussuri
- focal-victoria
- focal-wallaby
- focal-xena:
# gr tests are disabled due to:
# https://bugs.launchpad.net/charm-openstack-dashboard/+bug/1951644
- bionic-train-gr:
voting: false
- groovy-victoria
- hirsute-wallaby
- impish-xena:
- focal-ussuri-gr:
voting: false
- jammy-yoga-gr:
voting: false
- job:
name: checklist-work-required-xenial-mitaka
name: checklist-work-required-bionic-queens
parent: func-target
dependencies: &smoke-jobs
- bionic-ussuri
vars:
tox_extra_args: checklist-work-required:xenial-mitaka
- job:
name: checklist-work-required-bionic-queens
parent: func-target
dependencies: *smoke-jobs
vars:
tox_extra_args: checklist-work-required:bionic-queens
- job:
@ -39,3 +33,15 @@
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
vars:
tox_extra_args: vault:jammy-vault dashboard:jammy-yoga-cmr-vault

62
tests/bundles/focal-ussuri-cmr-vault.yaml Normal file
View File

@ -0,0 +1,62 @@
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

33
tests/bundles/focal-vault.yaml Normal file
View File

@ -0,0 +1,33 @@
series: focal
local_overlay_enabled: false
machines:
'0':
constraints: virt-type=kvm mem=3072M
'1':
constraints: virt-type=kvm mem=3072M
'2':
constraints: virt-type=kvm mem=3072M
'3':
services:
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
num_units: 3
options:
source: distro
to:
- '0'
- '1'
- '2'
vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
vault:
num_units: 1
series: bionic
charm: cs:~openstack-charmers-next/vault
to:
- '4'
relations:
- - vault:shared-db
- vault-mysql-router:shared-db
- - vault-mysql-router:db-router
- mysql-innodb-cluster:db-router

69
tests/bundles/focal-yoga.yaml Normal file
View File

@ -0,0 +1,69 @@
variables:
openstack-origin: &openstack-origin cloud:focal-yoga
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'

33
tests/bundles/jammy-vault.yaml Normal file
View File

@ -0,0 +1,33 @@
series: jammy
local_overlay_enabled: false
machines:
'0':
constraints: virt-type=kvm mem=3072M
'1':
constraints: virt-type=kvm mem=3072M
'2':
constraints: virt-type=kvm mem=3072M
'3':
services:
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
num_units: 3
options:
source: distro
to:
- '0'
- '1'
- '2'
vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
vault:
num_units: 1
series: bionic
charm: cs:~openstack-charmers-next/vault
to:
- '4'
relations:
- - vault:shared-db
- vault-mysql-router:shared-db
- - vault-mysql-router:db-router
- mysql-innodb-cluster:db-router

62
tests/bundles/jammy-yoga-cmr-vault.yaml Normal file
View File

@ -0,0 +1,62 @@
series: jammy
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

2
tests/bundles/groovy-victoria.yaml → tests/bundles/jammy-yoga.yaml
View File

@ -1,7 +1,7 @@
variables:
openstack-origin: &openstack-origin distro
series: groovy
series: jammy
comment:
- 'machines section to decide order of deployment. database sooner = faster'

12
tests/bundles/overlays/bionic-queens-cmr-vault.yaml.j2
View File

@ -1,12 +0,0 @@
applications:
openstack-dashboard:
options:
vip: '{{ OS_VIP00 }}'
relations:
- - openstack-dashboard:certificates
- vault:certificates
- - keystone:certificates
- vault:certificates
saas:
vault:
url: admin/{{ vault }}.vault

1
tests/bundles/overlays/bionic-queens-cmr-vault.yaml.j2 Symbolic link
View File

@ -0,0 +1 @@
cmr-vault.yaml.j2

7
tests/bundles/overlays/bionic-vault.yaml.j2
View File

@ -1,7 +0,0 @@
applications:
vault:
offers:
vault:
endpoints:
- secrets
- certificates

1
tests/bundles/overlays/bionic-vault.yaml.j2 Symbolic link
View File

@ -0,0 +1 @@
vault.yaml.j2

12
tests/bundles/overlays/cmr-vault.yaml.j2 Normal file
View File

@ -0,0 +1,12 @@
applications:
openstack-dashboard:
options:
vip: '{{ OS_VIP00 }}'
relations:
- - openstack-dashboard:certificates
- vault:certificates
- - keystone:certificates
- vault:certificates
saas:
vault:
url: admin/{{ vault }}.vault

1
tests/bundles/overlays/focal-ussuri-cmr-vault.yaml.j2 Symbolic link
View File

@ -0,0 +1 @@
cmr-vault.yaml.j2

1
tests/bundles/overlays/focal-vault.yaml.j2 Symbolic link
View File

@ -0,0 +1 @@
vault.yaml.j2

1
tests/bundles/overlays/jammy-vault.yaml.j2 Symbolic link
View File

@ -0,0 +1 @@
vault.yaml.j2

1
tests/bundles/overlays/jammy-yoga-cmr-vault.yaml.j2 Symbolic link
View File

@ -0,0 +1 @@
cmr-vault.yaml.j2

7
tests/bundles/overlays/vault.yaml.j2 Normal file
View File

@ -0,0 +1,7 @@
applications:
vault:
offers:
vault:
endpoints:
- secrets
- certificates

35
tests/bundles/xenial-mitaka.yaml
View File

@ -1,35 +0,0 @@
series: xenial
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'

39
tests/bundles/xenial-queens.yaml
View File

@ -1,39 +0,0 @@
series: xenial
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:xenial-queens
to:
- '1'
openstack-dashboard:
charm: ../../../openstack-dashboard
num_units: 1
options:
openstack-origin: cloud:xenial-queens
to:
- '2'

31
tests/tests.yaml
View File

@ -7,27 +7,31 @@ smoke_bundles:
- focal-ussuri
gate_bundles:
- bionic-train-gr:
- vault: bionic-vault
- dashboard: bionic-queens-cmr-vault
# See bug #1915293 for more details
- checklist-work-required: xenial-mitaka
- checklist-work-required: xenial-queens
- checklist-work-required: bionic-queens
- bionic-rocky
- bionic-stein
- bionic-train
- bionic-ussuri
- focal-ussuri
- focal-ussuri-gr:
- vault: focal-vault
- dashboard: focal-ussuri-cmr-vault
- focal-victoria
- focal-wallaby
- groovy-victoria
dev_bundles:
- 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:
- vault: jammy-vault
- dashboard: jammy-yoga-cmr-vault
configure:
- vault:
- zaza.openstack.charm_tests.vault.setup.auto_initialize_no_validation_no_wait
@ -56,10 +60,11 @@ tests_options:
policyd:
service: openstack-dashboard
force_deploy:
- groovy-victoria
- hirsute-wallaby
- impish-xena
- jammy-yoga
target_deploy_status:
vault:
workload-status: blocked
workload-status-message: Vault needs to be initialized
workload-status-message-prefix: Vault needs to be initialized

5
tox.ini
View File

@ -61,6 +61,11 @@ basepython = python3.8
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
[testenv:py39]
basepython = python3.9
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
[testenv:py3]
basepython = python3
deps = -r{toxinidir}/requirements.txt