Upgrade key for ceph-osd
This change adds the upgrade key for the ceph-osd charm allowing it to perform rolling upgrades. This change is already in ceph-mon and just copied over to make sure both charms have parity. Change-Id: Icab7c6e4a2d841739736707b06ca252321b7f732
This commit is contained in:
parent
080685d831
commit
4407400a91
|
@ -4,4 +4,4 @@ bin
|
|||
.testrepository
|
||||
.tox
|
||||
*.sw[nop]
|
||||
.pyc
|
||||
*.pyc
|
||||
|
|
|
@ -298,6 +298,16 @@ _radosgw_caps = {
|
|||
'osd': ['allow rwx']
|
||||
}
|
||||
|
||||
osd_upgrade_caps = {
|
||||
'mon': ['allow command "config-key"',
|
||||
'allow command "osd tree"',
|
||||
'allow command "config-key list"',
|
||||
'allow command "config-key put"',
|
||||
'allow command "config-key get"',
|
||||
'allow command "config-key exists"',
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
def get_radosgw_key():
|
||||
return get_named_key('radosgw.gateway', _radosgw_caps)
|
||||
|
|
|
@ -326,6 +326,8 @@ def osd_relation(relid=None):
|
|||
'osd_bootstrap_key': ceph.get_osd_bootstrap_key(),
|
||||
'auth': config('auth-supported'),
|
||||
'ceph-public-address': public_addr,
|
||||
'osd_upgrade_key': ceph.get_named_key('osd-upgrade',
|
||||
caps=ceph.osd_upgrade_caps),
|
||||
}
|
||||
relation_set(relation_id=relid,
|
||||
relation_settings=data)
|
||||
|
|
Loading…
Reference in New Issue