Don't set the default pool as "iscsi"
"iscsi" is the name of the metadata pool by default in the charm and not
to be used for tenant data. The charm can fill out the data pool name
automatically with `def data_pool_name` or can accept a user specified
value. After fixing the issue, the "iscsi" pool will be used only for
hosting gateway.conf as a rados object so reflect the purpose into the
application name for the pool too.
Also, update the command syntax not to print the deprecation warning:
"rbd: --user is deprecated, use --id"
Closes-Bug: #2042419
Related-Bug: #2040274
Change-Id: Iec275190854edcc85915d93db233f444c92fbb17
(cherry picked from commit 82779e5ff9
)
This commit is contained in:
parent
2b88df327f
commit
50bd805fb1
|
@ -42,11 +42,9 @@ create-target:
|
|||
description: "Image name "
|
||||
rbd-pool-name:
|
||||
type: string
|
||||
default: iscsi
|
||||
description: "Name of ceph pool to use to back target "
|
||||
ec-rbd-metadata-pool:
|
||||
type: string
|
||||
default: iscsi
|
||||
description: "Name of the metadata pool to use with rbd-pool-name if rbd-pool-name is erasure coded."
|
||||
client-initiatorname:
|
||||
type: string
|
||||
|
|
|
@ -313,7 +313,7 @@ class CephISCSIGatewayCharmBase(
|
|||
return
|
||||
self.ceph_client.create_replicated_pool(
|
||||
self.config_get('gateway-metadata-pool'),
|
||||
app_name='rbd')
|
||||
app_name='rados')
|
||||
weight = self.config_get('ceph-pool-weight')
|
||||
replicas = self.config_get('ceph-osd-replication-count')
|
||||
if self.config_get('pool-type') == 'erasure-coded':
|
||||
|
@ -539,7 +539,7 @@ class CephISCSIGatewayCharmBase(
|
|||
# as the gwcli does not currently handle the creation.
|
||||
cmd = [
|
||||
'rbd',
|
||||
'--user', 'ceph-iscsi',
|
||||
'--id', 'ceph-iscsi',
|
||||
'--conf', str(self.CEPH_CONF),
|
||||
'create',
|
||||
'--size', event.params['image-size'],
|
||||
|
|
|
@ -288,7 +288,7 @@ class TestCephISCSIGatewayCharmBase(CharmTestCase):
|
|||
self.subprocess.check_call.assert_called_once_with(
|
||||
[
|
||||
'rbd',
|
||||
'--user', 'ceph-iscsi',
|
||||
'--id', 'ceph-iscsi',
|
||||
'--conf', '/etc/ceph/iscsi/ceph.conf',
|
||||
'create',
|
||||
'--size', '5G',
|
||||
|
|
Loading…
Reference in New Issue