openstack/charm-neutron-gateway
Code Issues Proposed changes

Updates for 20.08 cycle start for groovy and libs

Browse Source 
- 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: I9bda975f774502ffa7c7d2fbf6617c38784bd602
This commit is contained in:
Alex Kavanagh 2020-06-02 14:22:19 +01:00
parent 775c06f8ff
commit 637e08105b
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hooks/charmhelpers/contrib/openstack/utils.py
View File

@ -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

8
hooks/charmhelpers/contrib/storage/linux/ceph.py
View File

@ -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

2
hooks/charmhelpers/fetch/snap.py
View File

@ -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

1
metadata.yaml
View File

@ -21,6 +21,7 @@ series:
- eoan
- focal
- trusty
- groovy
extra-bindings:
data:
provides: