From b108353235bd40bf8f36004e6caee6be42578b15 Mon Sep 17 00:00:00 2001 From: Ade Lee Date: Wed, 12 Dec 2012 15:03:09 -0500 Subject: Removed duplicate pki_instance_id parameter. Ticket 435 --- base/deploy/src/scriptlets/finalization.py | 4 +-- base/deploy/src/scriptlets/initialization.py | 6 ++-- base/deploy/src/scriptlets/pkihelper.py | 50 ++++++++++++++-------------- base/deploy/src/scriptlets/pkiparser.py | 42 +++++++++++------------ 4 files changed, 51 insertions(+), 51 deletions(-) (limited to 'base/deploy/src') diff --git a/base/deploy/src/scriptlets/finalization.py b/base/deploy/src/scriptlets/finalization.py index 1a6e731ae..fa8a31e1f 100644 --- a/base/deploy/src/scriptlets/finalization.py +++ b/base/deploy/src/scriptlets/finalization.py @@ -84,7 +84,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): # Log final process messages config.pki_log.info(log.PKISPAWN_END_MESSAGE_2, master['pki_subsystem'], - master['pki_instance_id'], + master['pki_instance_name'], extra=config.PKI_INDENTATION_LEVEL_0) util.file.modify(master['pki_spawn_log'], silent=True) # If instance has not been configured, print the @@ -111,6 +111,6 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): util.systemd.start() config.pki_log.info(log.PKIDESTROY_END_MESSAGE_2, master['pki_subsystem'], - master['pki_instance_id'], + master['pki_instance_name'], extra=config.PKI_INDENTATION_LEVEL_0) return self.rv diff --git a/base/deploy/src/scriptlets/initialization.py b/base/deploy/src/scriptlets/initialization.py index ba678cc27..034179ef1 100644 --- a/base/deploy/src/scriptlets/initialization.py +++ b/base/deploy/src/scriptlets/initialization.py @@ -35,7 +35,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): # begin official logging config.pki_log.info(log.PKISPAWN_BEGIN_MESSAGE_2, master['pki_subsystem'], - master['pki_instance_id'], + master['pki_instance_name'], extra=config.PKI_INDENTATION_LEVEL_0) if config.str2bool(master['pki_skip_installation']): config.pki_log.info(log.SKIP_INITIALIZATION_SPAWN_1, __name__, @@ -76,7 +76,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): # begin official logging config.pki_log.info(log.PKIRESPAWN_BEGIN_MESSAGE_2, master['pki_subsystem'], - master['pki_instance_id'], + master['pki_instance_name'], extra=config.PKI_INDENTATION_LEVEL_0) config.pki_log.info(log.INITIALIZATION_RESPAWN_1, __name__, extra=config.PKI_INDENTATION_LEVEL_1) @@ -89,7 +89,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): # begin official logging config.pki_log.info(log.PKIDESTROY_BEGIN_MESSAGE_2, master['pki_subsystem'], - master['pki_instance_id'], + master['pki_instance_name'], extra=config.PKI_INDENTATION_LEVEL_0) config.pki_log.info(log.INITIALIZATION_DESTROY_1, __name__, extra=config.PKI_INDENTATION_LEVEL_1) diff --git a/base/deploy/src/scriptlets/pkihelper.py b/base/deploy/src/scriptlets/pkihelper.py index 1eb7b51e6..ea84f7d0b 100644 --- a/base/deploy/src/scriptlets/pkihelper.py +++ b/base/deploy/src/scriptlets/pkihelper.py @@ -316,7 +316,7 @@ class namespace: # Top-Level PKI base path collision config.pki_log.error( log.PKIHELPER_NAMESPACE_COLLISION_2, - master['pki_instance_id'], + master['pki_instance_name'], master['pki_instance_path'], extra=config.PKI_INDENTATION_LEVEL_2) sys.exit(1) @@ -325,7 +325,7 @@ class namespace: # Top-Level "/etc/sysconfig" path collision config.pki_log.error( log.PKIHELPER_NAMESPACE_COLLISION_2, - master['pki_instance_id'], + master['pki_instance_name'], master['pki_target_tomcat_conf_instance_id'], extra=config.PKI_INDENTATION_LEVEL_2) sys.exit(1) @@ -333,7 +333,7 @@ class namespace: # Systemd cgroup path collision config.pki_log.error( log.PKIHELPER_NAMESPACE_COLLISION_2, - master['pki_instance_id'], + master['pki_instance_name'], master['pki_cgroup_systemd_service_path'], extra=config.PKI_INDENTATION_LEVEL_2) sys.exit(1) @@ -341,7 +341,7 @@ class namespace: # Systemd cgroup CPU path collision config.pki_log.error( log.PKIHELPER_NAMESPACE_COLLISION_2, - master['pki_instance_id'], + master['pki_instance_name'], master['pki_cgroup_cpu_systemd_service_path'], extra=config.PKI_INDENTATION_LEVEL_2) sys.exit(1) @@ -350,7 +350,7 @@ class namespace: # Top-Level PKI log path collision config.pki_log.error( log.PKIHELPER_NAMESPACE_COLLISION_2, - master['pki_instance_id'], + master['pki_instance_name'], master['pki_instance_log_path'], extra=config.PKI_INDENTATION_LEVEL_2) sys.exit(1) @@ -359,7 +359,7 @@ class namespace: # Top-Level PKI configuration path collision config.pki_log.error( log.PKIHELPER_NAMESPACE_COLLISION_2, - master['pki_instance_id'], + master['pki_instance_name'], master['pki_instance_configuration_path'], extra=config.PKI_INDENTATION_LEVEL_2) sys.exit(1) @@ -368,45 +368,45 @@ class namespace: # Top-Level PKI registry path collision config.pki_log.error( log.PKIHELPER_NAMESPACE_COLLISION_2, - master['pki_instance_id'], + master['pki_instance_name'], master['pki_instance_registry_path'], extra=config.PKI_INDENTATION_LEVEL_2) sys.exit(1) # Run simple checks for reserved name namespace collisions - if master['pki_instance_id'] in config.PKI_BASE_RESERVED_NAMES: + if master['pki_instance_name'] in config.PKI_BASE_RESERVED_NAMES: # Top-Level PKI base path reserved name collision config.pki_log.error( log.PKIHELPER_NAMESPACE_RESERVED_NAME_2, - master['pki_instance_id'], + master['pki_instance_name'], master['pki_instance_path'], extra=config.PKI_INDENTATION_LEVEL_2) sys.exit(1) # No need to check for reserved name under Top-Level PKI log path - if master['pki_instance_id'] in config.PKI_CONFIGURATION_RESERVED_NAMES: + if master['pki_instance_name'] in config.PKI_CONFIGURATION_RESERVED_NAMES: # Top-Level PKI configuration path reserved name collision config.pki_log.error( log.PKIHELPER_NAMESPACE_RESERVED_NAME_2, - master['pki_instance_id'], + master['pki_instance_name'], master['pki_instance_configuration_path'], extra=config.PKI_INDENTATION_LEVEL_2) sys.exit(1) if master['pki_subsystem'] in config.PKI_APACHE_SUBSYSTEMS: # Top-Level Apache PKI registry path reserved name collision - if master['pki_instance_id'] in\ + if master['pki_instance_name'] in\ config.PKI_APACHE_REGISTRY_RESERVED_NAMES: config.pki_log.error( log.PKIHELPER_NAMESPACE_RESERVED_NAME_2, - master['pki_instance_id'], + master['pki_instance_name'], master['pki_instance_registry_path'], extra=config.PKI_INDENTATION_LEVEL_2) sys.exit(1) elif master['pki_subsystem'] in config.PKI_TOMCAT_SUBSYSTEMS: # Top-Level Tomcat PKI registry path reserved name collision - if master['pki_instance_id'] in\ + if master['pki_instance_name'] in\ config.PKI_TOMCAT_REGISTRY_RESERVED_NAMES: config.pki_log.error( log.PKIHELPER_NAMESPACE_RESERVED_NAME_2, - master['pki_instance_id'], + master['pki_instance_name'], master['pki_instance_registry_path'], extra=config.PKI_INDENTATION_LEVEL_2) sys.exit(1) @@ -793,11 +793,11 @@ class configuration_file: # that are present in the corresponding configuration file if master['pki_deployment_executable'] == 'pkidestroy': if master['pki_deployed_instance_name'] !=\ - master['pki_instance_id']: + master['pki_instance_name']: config.pki_log.error( log.PKIHELPER_COMMAND_LINE_PARAMETER_MISMATCH_2, master['pki_deployed_instance_name'], - master['pki_instance_id'], + master['pki_instance_name'], extra=config.PKI_INDENTATION_LEVEL_2) sys.exit(1) return @@ -962,7 +962,7 @@ class instance: if not os.path.exists(master['pki_subsystem_path']): config.pki_log.error(log.PKI_SUBSYSTEM_DOES_NOT_EXIST_2, master['pki_subsystem'], - master['pki_instance_id'], + master['pki_instance_name'], extra=config.PKI_INDENTATION_LEVEL_2) sys.exit(1) except OSError as exc: @@ -975,7 +975,7 @@ class instance: if os.path.exists(master['pki_subsystem_path']): config.pki_log.error(log.PKI_SUBSYSTEM_ALREADY_EXISTS_2, master['pki_subsystem'], - master['pki_instance_id'], + master['pki_instance_name'], extra=config.PKI_INDENTATION_LEVEL_2) sys.exit(1) except OSError as exc: @@ -2448,12 +2448,12 @@ class systemd: command = "systemctl" + " " +\ "start" + " " +\ "pki-apached" + "@" +\ - master['pki_instance_id'] + "." + "service" + master['pki_instance_name'] + "." + "service" elif master['pki_subsystem'] in config.PKI_TOMCAT_SUBSYSTEMS: command = "systemctl" + " " +\ "start" + " " +\ "pki-tomcatd" + "@" +\ - master['pki_instance_id'] + "." + "service" + master['pki_instance_name'] + "." + "service" # Display this "systemd" execution managment command config.pki_log.info( log.PKIHELPER_SYSTEMD_COMMAND_1, command, @@ -2474,12 +2474,12 @@ class systemd: command = "systemctl" + " " +\ "stop" + " " +\ "pki-apached" + "@" +\ - master['pki_instance_id'] + "." + "service" + master['pki_instance_name'] + "." + "service" elif master['pki_subsystem'] in config.PKI_TOMCAT_SUBSYSTEMS: command = "systemctl" + " " +\ "stop" + " " +\ "pki-tomcatd" + "@" +\ - master['pki_instance_id'] + "." + "service" + master['pki_instance_name'] + "." + "service" # Display this "systemd" execution managment command config.pki_log.info( log.PKIHELPER_SYSTEMD_COMMAND_1, command, @@ -2500,12 +2500,12 @@ class systemd: command = "systemctl" + " " +\ "restart" + " " +\ "pki-apached" + "@" +\ - master['pki_instance_id'] + "." + "service" + master['pki_instance_name'] + "." + "service" elif master['pki_subsystem'] in config.PKI_TOMCAT_SUBSYSTEMS: command = "systemctl" + " " +\ "restart" + " " +\ "pki-tomcatd" + "@" +\ - master['pki_instance_id'] + "." + "service" + master['pki_instance_name'] + "." + "service" # Display this "systemd" execution managment command config.pki_log.info( log.PKIHELPER_SYSTEMD_COMMAND_1, command, diff --git a/base/deploy/src/scriptlets/pkiparser.py b/base/deploy/src/scriptlets/pkiparser.py index 558873ded..c0f5a432f 100644 --- a/base/deploy/src/scriptlets/pkiparser.py +++ b/base/deploy/src/scriptlets/pkiparser.py @@ -359,7 +359,7 @@ class PKIConfigParser: config.pki_master_dict['pki_systemd_service_link'] =\ config.pki_master_dict['pki_systemd_target_wants'] + "/" +\ "pki-apached" + "@" +\ - config.pki_master_dict['pki_instance_id'] + ".service" + config.pki_master_dict['pki_instance_name'] + ".service" elif config.pki_master_dict['pki_subsystem'] in\ config.PKI_TOMCAT_SUBSYSTEMS: config.pki_master_dict['pki_systemd_service'] =\ @@ -374,7 +374,7 @@ class PKIConfigParser: config.pki_master_dict['pki_systemd_service_link'] =\ config.pki_master_dict['pki_systemd_target_wants'] + "/" +\ "pki-tomcatd" + "@" +\ - config.pki_master_dict['pki_instance_id'] + ".service" + config.pki_master_dict['pki_instance_name'] + ".service" config.pki_master_dict['pki_tomcat_bin_path'] =\ os.path.join(config.PKI_DEPLOYMENT_TOMCAT_ROOT, "bin") @@ -456,14 +456,14 @@ class PKIConfigParser: config.pki_master_dict['pki_cgroup_systemd_service'] =\ os.path.join( config.pki_master_dict['pki_cgroup_systemd_service_path'], - config.pki_master_dict['pki_instance_id']) + config.pki_master_dict['pki_instance_name']) config.pki_master_dict['pki_cgroup_cpu_systemd_service_path'] =\ os.path.join("/sys/fs/cgroup/cpu\,cpuacct/system", config.pki_master_dict['pki_systemd_service']) config.pki_master_dict['pki_cgroup_cpu_systemd_service'] =\ os.path.join( config.pki_master_dict['pki_cgroup_cpu_systemd_service_path'], - config.pki_master_dict['pki_instance_id']) + config.pki_master_dict['pki_instance_name']) # PKI top-level file system layout name/value pairs # NOTE: Never use 'os.path.join()' whenever 'pki_root_prefix' # is being prepended!!! @@ -483,15 +483,15 @@ class PKIConfigParser: # Apache/Tomcat instance base name/value pairs config.pki_master_dict['pki_instance_path'] =\ os.path.join(config.pki_master_dict['pki_path'], - config.pki_master_dict['pki_instance_id']) + config.pki_master_dict['pki_instance_name']) # Apache/Tomcat instance log name/value pairs config.pki_master_dict['pki_instance_log_path'] =\ os.path.join(config.pki_master_dict['pki_log_path'], - config.pki_master_dict['pki_instance_id']) + config.pki_master_dict['pki_instance_name']) # Apache/Tomcat instance configuration name/value pairs config.pki_master_dict['pki_instance_configuration_path'] =\ os.path.join(config.pki_master_dict['pki_configuration_path'], - config.pki_master_dict['pki_instance_id']) + config.pki_master_dict['pki_instance_name']) # Apache/Tomcat instance registry name/value pairs # Apache-specific instance name/value pairs if config.pki_master_dict['pki_subsystem'] in\ @@ -508,7 +508,7 @@ class PKIConfigParser: config.pki_master_dict['pki_instance_registry_path'] =\ os.path.join( config.pki_master_dict['pki_instance_type_registry_path'], - config.pki_master_dict['pki_instance_id']) + config.pki_master_dict['pki_instance_name']) # Apache instance convenience symbolic links # Tomcat-specific instance name/value pairs elif config.pki_master_dict['pki_subsystem'] in\ @@ -572,7 +572,7 @@ class PKIConfigParser: config.pki_master_dict['pki_instance_registry_path'] =\ os.path.join( config.pki_master_dict['pki_instance_type_registry_path'], - config.pki_master_dict['pki_instance_id']) + config.pki_master_dict['pki_instance_name']) # Tomcat instance convenience symbolic links config.pki_master_dict['pki_tomcat_bin_link'] =\ os.path.join(config.pki_master_dict['pki_instance_path'], @@ -585,7 +585,7 @@ class PKIConfigParser: "log4j.properties") config.pki_master_dict['pki_instance_systemd_link'] =\ os.path.join(config.pki_master_dict['pki_instance_path'], - config.pki_master_dict['pki_instance_id']) + config.pki_master_dict['pki_instance_name']) # Tomcat instance common lib jars if config.pki_master_dict['pki_architecture'] == 64: config.pki_master_dict['pki_jss_jar'] =\ @@ -944,7 +944,7 @@ class PKIConfigParser: "CS.cfg") config.pki_master_dict['pki_target_registry'] =\ os.path.join(config.pki_master_dict['pki_instance_registry_path'], - config.pki_master_dict['pki_instance_id']) + config.pki_master_dict['pki_instance_name']) if config.pki_master_dict['pki_subsystem'] == "CA" and\ config.str2bool(config.pki_master_dict['pki_external_step_two']): # Use the 'pki_one_time_pin' established during the setup of @@ -989,7 +989,7 @@ class PKIConfigParser: config.pki_master_dict['pki_target_tomcat_conf_instance_id'] =\ config.pki_master_dict['pki_root_prefix'] +\ "/etc/sysconfig/" +\ - config.pki_master_dict['pki_instance_id'] + config.pki_master_dict['pki_instance_name'] config.pki_master_dict['pki_target_tomcat_conf'] =\ os.path.join( config.pki_master_dict['pki_instance_configuration_path'], @@ -1083,13 +1083,13 @@ class PKIConfigParser: # Slot assignment name/value pairs # NOTE: Master key == Slots key; Master value ==> Slots value config.pki_master_dict['PKI_INSTANCE_ID_SLOT'] =\ - config.pki_master_dict['pki_instance_id'] + config.pki_master_dict['pki_instance_name'] config.pki_master_dict['PKI_INSTANCE_INITSCRIPT_SLOT'] =\ os.path.join(config.pki_master_dict['pki_instance_path'], - config.pki_master_dict['pki_instance_id']) + config.pki_master_dict['pki_instance_name']) config.pki_master_dict['PKI_REGISTRY_FILE_SLOT'] =\ os.path.join(config.pki_master_dict['pki_subsystem_registry_path'], - config.pki_master_dict['pki_instance_id']) + config.pki_master_dict['pki_instance_name']) if config.pki_master_dict['pki_subsystem'] in\ config.PKI_APACHE_SUBSYSTEMS: config.pki_master_dict['FORTITUDE_APACHE_SLOT'] = None @@ -1233,7 +1233,7 @@ class PKIConfigParser: config.pki_master_dict['pki_subsystem'].lower() config.pki_master_dict['PKI_SYSTEMD_SERVICENAME_SLOT'] =\ "pki-tomcatd" + "@" +\ - config.pki_master_dict['pki_instance_id'] + ".service" + config.pki_master_dict['pki_instance_name'] + ".service" config.pki_master_dict['PKI_UNSECURE_PORT_SLOT'] =\ config.pki_master_dict['pki_http_port'] config.pki_master_dict['PKI_UNSECURE_PORT_CONNECTOR_NAME_SLOT'] =\ @@ -1255,7 +1255,7 @@ class PKIConfigParser: config.pki_master_dict['TOMCAT_LOG_DIR_SLOT'] =\ config.pki_master_dict['pki_instance_log_path'] config.pki_master_dict['TOMCAT_PIDFILE_SLOT'] =\ - "/var/run/pki/tomcat/" + config.pki_master_dict['pki_instance_id'] + ".pid" + "/var/run/pki/tomcat/" + config.pki_master_dict['pki_instance_name'] + ".pid" config.pki_master_dict['TOMCAT_SERVER_PORT_SLOT'] =\ config.pki_master_dict['pki_tomcat_server_port'] config.pki_master_dict['TOMCAT_SSL2_CIPHERS_SLOT'] =\ @@ -1326,7 +1326,7 @@ class PKIConfigParser: "secmod.db") config.pki_master_dict['pki_self_signed_token'] = "internal" config.pki_master_dict['pki_self_signed_nickname'] =\ - "Server-Cert cert-" + config.pki_master_dict['pki_instance_id'] + "Server-Cert cert-" + config.pki_master_dict['pki_instance_name'] config.pki_master_dict['pki_self_signed_subject'] =\ "cn=" + config.pki_master_dict['pki_hostname'] + "," +\ "o=" + config.pki_master_dict['pki_certificate_timestamp'] @@ -1369,7 +1369,7 @@ class PKIConfigParser: config.pki_master_dict['pki_client_dir'] =\ os.path.join( os.path.expanduser("~"), ".pki", - config.pki_master_dict['pki_instance_id']) + config.pki_master_dict['pki_instance_name']) config.pki_master_dict['pki_client_subsystem_dir'] =\ os.path.join( config.pki_master_dict['pki_client_dir'], @@ -1615,14 +1615,14 @@ class PKIConfigParser: "systemctl" + " " +\ "restart" + " " +\ "pki-apached" + "@" +\ - config.pki_master_dict['pki_instance_id'] + "." + "service" + config.pki_master_dict['pki_instance_name'] + "." + "service" elif config.pki_master_dict['pki_subsystem'] in\ config.PKI_TOMCAT_SUBSYSTEMS: config.pki_master_dict['pki_registry_initscript_command'] =\ "systemctl" + " " +\ "restart" + " " +\ "pki-tomcatd" + "@" +\ - config.pki_master_dict['pki_instance_id'] + "." + "service" + config.pki_master_dict['pki_instance_name'] + "." + "service" except OSError as exc: config.pki_log.error(log.PKI_OSERROR_1, exc, extra=config.PKI_INDENTATION_LEVEL_2) -- cgit