diff --git a/charmhelpers/contrib/openstack/utils.py b/charmhelpers/contrib/openstack/utils.py index e59e0d1e7e572ea4197e41dbff4c70e584e1f03d..fbf0156108537f9caae35e193c346b0e4ee237b9 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 95a0d82ad689061249b289e8de23eb3ce3aaaec4..814d5c72bc246c9536d3bb5975ade1c7fbe989e4 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 395836c70c7d4536e3196692152714202a3fa0ba..fc70aa941bc4f0bb5ff126237db65705b9e4a10a 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 f0e63b93b6a1fc48c2da674398720f94fb02d98d..eafcca7a4b166c0535777e4621a06d34788b055e 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: