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>

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 2a1ff2db6421500a88c169ccc8b63c13f8759a19..1fb48f581b3068794cb2bd1f4ab9109b8ee730e7 100644 (file)
--- 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 7df8c847cecc7c792de81cbb71e59ae501da2775..711a090447168d0803b93febde8428c2fda68e11 100644 (file)
--- 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 5bcf7d91a9ae1a2f9aed2e7840e45177aaaf0372..4bdf3dd23c23b9c0e13dd1dafa491ce1a61719a4 100644 (file)
--- 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