From fb295911ac318c0c063a8f03e7d2ccfc3ea0b241 Mon Sep 17 00:00:00 2001
From: Matthew Oliver <moliver@suse.com>
Date: Fri, 24 Apr 2020 06:17:50 +0000
Subject: [PATCH] cephadm: remove fqdn_enabled from ceph-iscsi

The fqdn_enabled option never actually landed in the ceph-iscsi master
branch. So this patch removes it from the cephadm ceph-iscsi spec.

Fixes: https://tracker.ceph.com/issues/45196
Signed-off-by: Matthew Oliver <moliver@suse.com>
---
 src/pybind/mgr/cephadm/module.py                  | 1 -
 src/pybind/mgr/orchestrator/module.py             | 4 +---
 src/python-common/ceph/deployment/service_spec.py | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 2a1ff2db642..1fb48f581b3 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -2919,7 +2919,6 @@ cluster_client_name = {utils.name_to_config_section('iscsi')}.{igw_id}
 pool = {spec.pool}
 trusted_ip_list = {spec.trusted_ip_list or ''}
 minimum_gateways = 1
-fqdn_enabled = {spec.fqdn_enabled or ''}
 api_port = {spec.api_port or ''}
 api_user = {spec.api_user or ''}
 api_password = {spec.api_password or ''}
diff --git a/src/pybind/mgr/orchestrator/module.py b/src/pybind/mgr/orchestrator/module.py
index 7df8c847cec..711a0904471 100644
--- a/src/pybind/mgr/orchestrator/module.py
+++ b/src/pybind/mgr/orchestrator/module.py
@@ -728,11 +728,10 @@ Usage:
     @_cli_write_command(
         'orch daemon add iscsi',
         'name=pool,type=CephString '
-        'name=fqdn_enabled,type=CephString,req=false '
         'name=trusted_ip_list,type=CephString,req=false '
         'name=placement,type=CephString,req=false',
         'Start iscsi daemon(s)')
-    def _iscsi_add(self, pool, fqdn_enabled=None, trusted_ip_list=None, placement=None, inbuf=None):
+    def _iscsi_add(self, pool, trusted_ip_list=None, placement=None, inbuf=None):
         usage = """
         Usage:
           ceph orch daemon add iscsi -i <json_file>
@@ -748,7 +747,6 @@ Usage:
             iscsi_spec = IscsiServiceSpec(
                 service_id='iscsi',
                 pool=pool,
-                fqdn_enabled=fqdn_enabled,
                 trusted_ip_list=trusted_ip_list,
                 placement=PlacementSpec.from_string(placement),
             )
diff --git a/src/python-common/ceph/deployment/service_spec.py b/src/python-common/ceph/deployment/service_spec.py
index 5bcf7d91a9a..4bdf3dd23c2 100644
--- a/src/python-common/ceph/deployment/service_spec.py
+++ b/src/python-common/ceph/deployment/service_spec.py
@@ -575,7 +575,6 @@ class IscsiServiceSpec(ServiceSpec):
     def __init__(self, service_id, pool=None,
                  placement=None,
                  trusted_ip_list=None,
-                 fqdn_enabled=None,
                  api_port=None,
                  api_user=None,
                  api_password=None,
@@ -591,7 +590,6 @@ class IscsiServiceSpec(ServiceSpec):
         #: RADOS pool where ceph-iscsi config data is stored.
         self.pool = pool
         self.trusted_ip_list = trusted_ip_list
-        self.fqdn_enabled = fqdn_enabled
         self.api_port = api_port
         self.api_user = api_user
         self.api_password = api_password
-- 
2.39.5