From d13a5791b2c36fccebc8febe6d2afcafd2a58bd3 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: Ib453fa02467788d01392df427c0637f1060d9247
---
 charmhelpers/contrib/openstack/utils.py    |  2 +-
 charmhelpers/contrib/storage/linux/ceph.py |  8 +++----
 charmhelpers/fetch/snap.py                 |  2 +-
 metadata.yaml                              | 25 +++++++++++-----------
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/charmhelpers/contrib/openstack/utils.py b/charmhelpers/contrib/openstack/utils.py
index e59e0d1e..fbf01561 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 95a0d82a..814d5c72 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 395836c7..fc70aa94 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 18ecca7d..c37cebd3 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -2,20 +2,21 @@ name: glance
 maintainer: OpenStack Charmers <openstack-charmers@lists.ubuntu.com>
 summary: OpenStack Image Registry and Delivery Service
 description: |
- The Glance project provides an image registration and discovery service
- and an image delivery service. These services are used in conjunction
- by Nova to deliver images from object stores, such as OpenStack's Swift
- service, to Nova's compute nodes.
+  The Glance project provides an image registration and discovery service
+  and an image delivery service. These services are used in conjunction
+  by Nova to deliver images from object stores, such as OpenStack's Swift
+  service, to Nova's compute nodes.
 tags:
-  - openstack
-  - storage
-  - misc
+- openstack
+- storage
+- misc
 series:
-  - xenial
-  - bionic
-  - eoan
-  - focal
-  - trusty
+- xenial
+- bionic
+- eoan
+- focal
+- trusty
+- groovy
 extra-bindings:
   public:
   admin: