Merge "Updates for 20.08 cycle start for groovy and libs"
This commit is contained in:
commit
96a63879f5
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1139,8 +1139,9 @@ osd_upgrade_caps = collections.OrderedDict([
|
|||
])
|
||||
|
||||
rbd_mirror_caps = collections.OrderedDict([
|
||||
('mon', ['profile rbd']),
|
||||
('mon', ['profile rbd; allow r']),
|
||||
('osd', ['profile rbd']),
|
||||
('mgr', ['allow r']),
|
||||
])
|
||||
|
||||
|
||||
|
|
|
@ -6,22 +6,23 @@ provides:
|
|||
interface: nrpe-external-master
|
||||
scope: container
|
||||
tags:
|
||||
- openstack
|
||||
- storage
|
||||
- file-servers
|
||||
- misc
|
||||
- openstack
|
||||
- storage
|
||||
- file-servers
|
||||
- misc
|
||||
series:
|
||||
- xenial
|
||||
- bionic
|
||||
- eoan
|
||||
- focal
|
||||
- trusty
|
||||
- xenial
|
||||
- bionic
|
||||
- eoan
|
||||
- focal
|
||||
- trusty
|
||||
- groovy
|
||||
description: |
|
||||
Ceph is a distributed storage and network file system designed to provide
|
||||
excellent performance, reliability, and scalability.
|
||||
.
|
||||
This charm provides the Ceph OSD personality for expanding storage capacity
|
||||
within a ceph deployment.
|
||||
Ceph is a distributed storage and network file system designed to provide
|
||||
excellent performance, reliability, and scalability.
|
||||
.
|
||||
This charm provides the Ceph OSD personality for expanding storage capacity
|
||||
within a ceph deployment.
|
||||
extra-bindings:
|
||||
public:
|
||||
cluster:
|
||||
|
|
Loading…
Reference in New Issue