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: Ifac4b14907328345f1fc8f645a61a4812519670c

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
 

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

metadata.yaml

@@ -2,27 +2,28 @@ name: swift-storage
 summary: OpenStack Object Storage - Swift storage service
 maintainer: OpenStack Charmers <openstack-charmers@lists.ubuntu.com>
 description: |
- OpenStack Object Storage (code-named Swift) is open source software for
- creating redundant, scalable object storage using clusters of standardized
- servers to store petabytes of accessible data. It is not a file system or
- real-time data storage system, but rather a long-term storage system for a
- more permanent type of static data that can be retrieved, leveraged, and
- then updated if necessary. Primary examples of data that best fit this
- type of storage model are virtual machine images, photo storage, email
- storage and backup archiving. Having no central "brain" or master point of
- control provides greater scalability, redundancy and permanence.
- .
- This charm deploys the Swift storage service, supporting HTTP based access
- via Swift proxy services.
+  OpenStack Object Storage (code-named Swift) is open source software for
+  creating redundant, scalable object storage using clusters of standardized
+  servers to store petabytes of accessible data. It is not a file system or
+  real-time data storage system, but rather a long-term storage system for a
+  more permanent type of static data that can be retrieved, leveraged, and
+  then updated if necessary. Primary examples of data that best fit this
+  type of storage model are virtual machine images, photo storage, email
+  storage and backup archiving. Having no central "brain" or master point of
+  control provides greater scalability, redundancy and permanence.
+  .
+  This charm deploys the Swift storage service, supporting HTTP based access
+  via Swift proxy services.
 tags:
-  - openstack
-  - file-servers
+- openstack
+- file-servers
 series:
-  - xenial
-  - bionic
-  - eoan
-  - focal
-  - trusty
+- xenial
+- bionic
+- eoan
+- focal
+- trusty
+- groovy
 extra-bindings:
   replication:
   cluster: