Merge "Removed unused code in upgrade."

controllerconfig/controllerconfig/controllerconfig/upgrades/controller.py

@@ -793,12 +793,6 @@ def migrate_hiera_data(from_release, to_release, role=None):
     with open(secure_static_file, 'r') as yaml_file:
         secure_static_config = yaml.load(yaml_file)
 
-    # This code can be removed in the release that follows StX 6.0
-    sysinv_pass = utils.get_password_from_keyring('sysinv', 'services')
-    secure_static_config.update({
-        'sysinv::certalarm::local_keystone_password': sysinv_pass
-    })
-
     with open(secure_static_file, 'w') as yaml_file:
         yaml.dump(secure_static_config, yaml_file, default_flow_style=False)
 

sysinv/sysinv/sysinv/sysinv/conductor/manager.py

@@ -1676,36 +1676,6 @@ class ConductorManager(service.PeriodicService):
                      "Skipping deleting ceph monitor."
                      % str(host.hostname))
 
-    def _split_etcd_security_config(self, context):
-        """Update the manifests for separating etcd ca
-
-           Note: this can be removed in the release after STX6.0
-           returns True if runtime manifests were applied
-        """
-        controllers = self.dbapi.ihost_get_by_personality(constants.CONTROLLER)
-        for host in controllers:
-            if not utils.is_host_active_controller(host):
-                # Just update etcd certs on the standby controller.
-                # Etcd certs were updated on the active controller with
-                # migration script 71-enable-separate-etcd-ca.sh
-                personalities = [constants.CONTROLLER]
-                host_uuids = [host.uuid]
-                config_uuid = self._config_update_hosts(
-                    context, personalities, host_uuids)
-                config_dict = {
-                    "personalities": personalities,
-                    "host_uuids": host_uuids,
-                    "classes": ['platform::etcd::upgrade::runtime'],
-                    puppet_common.REPORT_STATUS_CFG:
-                        puppet_common.REPORT_UPGRADE_ACTIONS
-                }
-                self._config_apply_runtime_manifest(context,
-                                                    config_uuid=config_uuid,
-                                                    config_dict=config_dict)
-                return True
-
-        return False
-
     def kube_config_kubelet(self, context):
         """Update kubernetes nodes kubelet configuration ConfigMap.
 
@@ -12060,10 +12030,6 @@ class ConductorManager(service.PeriodicService):
                     {'state': constants.UPGRADE_ACTIVATION_FAILED})
 
         manifests_applied = False
-        if from_version == tsc.SW_VERSION_21_05:
-            # Apply etcd split ca puppet manifest for standby controller.
-            manifests_applied = self._split_etcd_security_config(context)
-
         if from_version in (tsc.SW_VERSION_21_12, tsc.SW_VERSION_22_06):
             manifests_applied |= self._update_kubeadm_feature_gates(context)
 

tsconfig/tsconfig/tsconfig/tsconfig.py

@@ -13,7 +13,6 @@ import six
 from six.moves import configparser
 
 SW_VERSION = ""
-SW_VERSION_21_05 = "21.05"
 SW_VERSION_21_12 = "21.12"
 SW_VERSION_22_06 = "22.06"
 SW_VERSION_22_12 = "22.12"