From ce7272e6f63d137bc804a48cd0145270ce35bc57 Mon Sep 17 00:00:00 2001
From: Alex Kavanagh <alex@ajkavanagh.co.uk>
Date: Tue, 2 Jun 2020 14:22:18 +0100
Subject: [PATCH] Updates for 20.08 cycle start for groovy and libs
- Adds groovy to the series in the metadata
- Classic charms: sync charm-helpers.
- Classic ceph based charms: also sync charms.ceph
- Reactive charms: trigger a rebuild
Change-Id: I1b49dc4f3e24483d7a64c6d9c2c55634e3b526e0
---
charmhelpers/contrib/openstack/utils.py | 2 +-
charmhelpers/contrib/storage/linux/ceph.py | 8 ++++----
charmhelpers/fetch/snap.py | 2 +-
metadata.yaml | 23 +++++++++++-----------
4 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/charmhelpers/contrib/openstack/utils.py b/charmhelpers/contrib/openstack/utils.py
index e59e0d1..fbf0156 100644
--- a/charmhelpers/contrib/openstack/utils.py
+++ b/charmhelpers/contrib/openstack/utils.py
@@ -225,7 +225,7 @@ SWIFT_CODENAMES = OrderedDict([
('train',
['2.22.0', '2.23.0']),
('ussuri',
- ['2.24.0']),
+ ['2.24.0', '2.25.0']),
])
# >= Liberty version->codename mapping
diff --git a/charmhelpers/contrib/storage/linux/ceph.py b/charmhelpers/contrib/storage/linux/ceph.py
index 95a0d82..814d5c7 100644
--- a/charmhelpers/contrib/storage/linux/ceph.py
+++ b/charmhelpers/contrib/storage/linux/ceph.py
@@ -432,13 +432,13 @@ class ReplicatedPool(Pool):
pool=self.name,
name=self.app_name)
except CalledProcessError:
- log('Could not set app name for pool {}'.format(self.name, level=WARNING))
+ log('Could not set app name for pool {}'.format(self.name), level=WARNING)
if 'pg_autoscaler' in enabled_manager_modules():
try:
enable_pg_autoscale(self.service, self.name)
except CalledProcessError as e:
log('Could not configure auto scaling for pool {}: {}'.format(
- self.name, e, level=WARNING))
+ self.name, e), level=WARNING)
except CalledProcessError:
raise
@@ -504,7 +504,7 @@ class ErasurePool(Pool):
pool=self.name,
name=self.app_name)
except CalledProcessError:
- log('Could not set app name for pool {}'.format(self.name, level=WARNING))
+ log('Could not set app name for pool {}'.format(self.name), level=WARNING)
if nautilus_or_later:
# Ensure we set the expected pool ratio
update_pool(client=self.service,
@@ -515,7 +515,7 @@ class ErasurePool(Pool):
enable_pg_autoscale(self.service, self.name)
except CalledProcessError as e:
log('Could not configure auto scaling for pool {}: {}'.format(
- self.name, e, level=WARNING))
+ self.name, e), level=WARNING)
except CalledProcessError:
raise
diff --git a/charmhelpers/fetch/snap.py b/charmhelpers/fetch/snap.py
index 395836c..fc70aa9 100644
--- a/charmhelpers/fetch/snap.py
+++ b/charmhelpers/fetch/snap.py
@@ -69,7 +69,7 @@ def _snap_exec(commands):
.format(SNAP_NO_LOCK_RETRY_COUNT))
return_code = e.returncode
log('Snap failed to acquire lock, trying again in {} seconds.'
- .format(SNAP_NO_LOCK_RETRY_DELAY, level='WARN'))
+ .format(SNAP_NO_LOCK_RETRY_DELAY), level='WARN')
sleep(SNAP_NO_LOCK_RETRY_DELAY)
return return_code
diff --git a/metadata.yaml b/metadata.yaml
index f0e63b9..eafcca7 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -2,19 +2,20 @@ name: ceph-proxy
summary: Proxy to Juju external Ceph cluster
maintainer: OpenStack Charmers <openstack-charmers@lists.ubuntu.com>
description: |
- Ceph is a distributed storage and network file system designed to provide
- excellent performance, reliability, and scalability.
+ Ceph is a distributed storage and network file system designed to provide
+ excellent performance, reliability, and scalability.
tags:
- - openstack
- - storage
- - file-servers
- - misc
+- openstack
+- storage
+- file-servers
+- misc
series:
- - xenial
- - bionic
- - eoan
- - focal
- - trusty
+- xenial
+- bionic
+- eoan
+- focal
+- trusty
+- groovy
extra-bindings:
public:
cluster:
--
GitLab