RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-30 07:19:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

mgr/dashboard: Upgrade ceph-iscsi config to version 10 (#28720)

Browse Source 
mgr/dashboard: Upgrade ceph-iscsi config to version 10

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
This commit is contained in:
Lenz Grimmer 2019-07-08 13:10:08 +02:00 committed by GitHub
commit 9c85727824
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pybind/mgr/dashboard/controllers/iscsi.py
View File

@ -25,7 +25,7 @@ from ..tools import TaskManager
@UiApiController('/iscsi', Scope.ISCSI)
class IscsiUi(BaseController):
REQUIRED_CEPH_ISCSI_CONFIG_VERSION = 9
REQUIRED_CEPH_ISCSI_CONFIG_VERSION = 10
@Endpoint()
@ReadPermission

28
src/pybind/mgr/dashboard/services/iscsi_config.py
View File

@ -54,7 +54,33 @@ class IscsiGatewaysConfig(object):
def _load_config_from_store(cls):
json_db = mgr.get_store(_ISCSI_STORE_KEY,
'{"gateways": {}}')
return json.loads(json_db)
config = json.loads(json_db)
cls.update_iscsi_config(config)
return config
@classmethod
def update_iscsi_config(cls, config):
"""
Since `ceph-iscsi` config v10, gateway names were renamed from host short name to FQDN.
If Ceph Dashboard were configured before v10, we try to update our internal gateways
database automatically.
"""
for gateway_name, gateway_config in config['gateways'].items():
if '.' not in gateway_name:
from .iscsi_client import IscsiClient
from ..rest_client import RequestException
try:
service_url = gateway_config['service_url']
new_gateway_name = IscsiClient.instance(
service_url=service_url).get_hostname()['data']
if gateway_name != new_gateway_name:
config['gateways'][new_gateway_name] = gateway_config
del config['gateways'][gateway_name]
cls._save_config(config)
except RequestException:
# If gateway is not acessible, it should be removed manually
# or we will try to update automatically next time
continue
@staticmethod
def _load_config_from_orchestrator():