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: Id9e0319806471fa4d074c77bff105e2083313e19
This commit is contained in:
parent
eedd374fa1
commit
9f90f8803b
|
@ -225,7 +225,7 @@ SWIFT_CODENAMES = OrderedDict([
|
||||||
('train',
|
('train',
|
||||||
['2.22.0', '2.23.0']),
|
['2.22.0', '2.23.0']),
|
||||||
('ussuri',
|
('ussuri',
|
||||||
['2.24.0']),
|
['2.24.0', '2.25.0']),
|
||||||
])
|
])
|
||||||
|
|
||||||
# >= Liberty version->codename mapping
|
# >= Liberty version->codename mapping
|
||||||
|
|
|
@ -248,7 +248,7 @@ def peer_store_and_set(relation_id=None, peer_relation_name='cluster',
|
||||||
@param relation_id: the id of the relation to store the data on. Defaults
|
@param relation_id: the id of the relation to store the data on. Defaults
|
||||||
to the current relation.
|
to the current relation.
|
||||||
@param peer_store_fatal: Set to True, the function will raise an exception
|
@param peer_store_fatal: Set to True, the function will raise an exception
|
||||||
should the peer sotrage not be avialable."""
|
should the peer storage not be available."""
|
||||||
|
|
||||||
relation_settings = relation_settings if relation_settings else {}
|
relation_settings = relation_settings if relation_settings else {}
|
||||||
relation_set(relation_id=relation_id,
|
relation_set(relation_id=relation_id,
|
||||||
|
|
|
@ -432,13 +432,13 @@ class ReplicatedPool(Pool):
|
||||||
pool=self.name,
|
pool=self.name,
|
||||||
name=self.app_name)
|
name=self.app_name)
|
||||||
except CalledProcessError:
|
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():
|
if 'pg_autoscaler' in enabled_manager_modules():
|
||||||
try:
|
try:
|
||||||
enable_pg_autoscale(self.service, self.name)
|
enable_pg_autoscale(self.service, self.name)
|
||||||
except CalledProcessError as e:
|
except CalledProcessError as e:
|
||||||
log('Could not configure auto scaling for pool {}: {}'.format(
|
log('Could not configure auto scaling for pool {}: {}'.format(
|
||||||
self.name, e, level=WARNING))
|
self.name, e), level=WARNING)
|
||||||
except CalledProcessError:
|
except CalledProcessError:
|
||||||
raise
|
raise
|
||||||
|
|
||||||
|
@ -504,7 +504,7 @@ class ErasurePool(Pool):
|
||||||
pool=self.name,
|
pool=self.name,
|
||||||
name=self.app_name)
|
name=self.app_name)
|
||||||
except CalledProcessError:
|
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:
|
if nautilus_or_later:
|
||||||
# Ensure we set the expected pool ratio
|
# Ensure we set the expected pool ratio
|
||||||
update_pool(client=self.service,
|
update_pool(client=self.service,
|
||||||
|
@ -515,7 +515,7 @@ class ErasurePool(Pool):
|
||||||
enable_pg_autoscale(self.service, self.name)
|
enable_pg_autoscale(self.service, self.name)
|
||||||
except CalledProcessError as e:
|
except CalledProcessError as e:
|
||||||
log('Could not configure auto scaling for pool {}: {}'.format(
|
log('Could not configure auto scaling for pool {}: {}'.format(
|
||||||
self.name, e, level=WARNING))
|
self.name, e), level=WARNING)
|
||||||
except CalledProcessError:
|
except CalledProcessError:
|
||||||
raise
|
raise
|
||||||
|
|
||||||
|
|
|
@ -69,7 +69,7 @@ def _snap_exec(commands):
|
||||||
.format(SNAP_NO_LOCK_RETRY_COUNT))
|
.format(SNAP_NO_LOCK_RETRY_COUNT))
|
||||||
return_code = e.returncode
|
return_code = e.returncode
|
||||||
log('Snap failed to acquire lock, trying again in {} seconds.'
|
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)
|
sleep(SNAP_NO_LOCK_RETRY_DELAY)
|
||||||
|
|
||||||
return return_code
|
return return_code
|
||||||
|
|
|
@ -6,11 +6,12 @@ description: |
|
||||||
compatible alternative implemented using the Galera
|
compatible alternative implemented using the Galera
|
||||||
synchronous replication extensions.
|
synchronous replication extensions.
|
||||||
tags:
|
tags:
|
||||||
- databases
|
- databases
|
||||||
series:
|
series:
|
||||||
- xenial
|
- xenial
|
||||||
- bionic
|
- bionic
|
||||||
- eoan
|
- eoan
|
||||||
|
- groovy
|
||||||
extra-bindings:
|
extra-bindings:
|
||||||
access:
|
access:
|
||||||
provides:
|
provides:
|
||||||
|
|
Loading…
Reference in New Issue