Merge pull request #118 from ceph/wip-fqdn-upgrade-fix

Handle the case where FQDN is the same as hostname
ceph · Jul 1, 2019 · c435110 · c435110
2 parents b2a236f + 826f788
commit c435110
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ceph_iscsi_config/common.py b/ceph_iscsi_config/common.py
@@ -328,15 +328,15 @@ def _upgrade_config(self):
                 gateways_config = self.config['gateways']
                 gateway_config = gateways_config.get(this_shortname)
                 if gateway_config:
-                    gateways_config[this_fqdn] = gateway_config
                     gateways_config.pop(this_shortname)
+                    gateways_config[this_fqdn] = gateway_config
                     self.update_item("gateways", None, gateways_config)
                 for target_iqn, target in self.config['targets'].items():
                     portals_config = target['portals']
                     portal_config = portals_config.get(this_shortname)
                     if portal_config:
-                        portals_config[this_fqdn] = portal_config
                         portals_config.pop(this_shortname)
+                        portals_config[this_fqdn] = portal_config
                         self.update_item("targets", target_iqn, target)
                 for disk_id, disk in self.config['disks'].items():
                     if disk.get('allocating_host') == this_shortname: