diff options
Diffstat (limited to 'base/server/python/pki/server/deployment/scriptlets/infrastructure_layout.py')
| -rw-r--r-- | base/server/python/pki/server/deployment/scriptlets/infrastructure_layout.py | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/base/server/python/pki/server/deployment/scriptlets/infrastructure_layout.py b/base/server/python/pki/server/deployment/scriptlets/infrastructure_layout.py index 5427eebca..7a8fa705c 100644 --- a/base/server/python/pki/server/deployment/scriptlets/infrastructure_layout.py +++ b/base/server/python/pki/server/deployment/scriptlets/infrastructure_layout.py @@ -31,7 +31,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): def spawn(self, deployer): - if config.str2bool(deployer.master_dict['pki_skip_installation']): + if config.str2bool(deployer.mdict['pki_skip_installation']): config.pki_log.info(log.SKIP_ADMIN_DOMAIN_SPAWN_1, __name__, extra=config.PKI_INDENTATION_LEVEL_1) return self.rv @@ -51,32 +51,32 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): # registry directories for storage of a copy of the original # deployment configuration file used to spawn this instance, # and save a copy of this file - deployer.directory.create(deployer.master_dict['pki_registry_path']) - deployer.directory.create(deployer.master_dict['pki_instance_type_registry_path']) - deployer.directory.create(deployer.master_dict['pki_instance_registry_path']) - deployer.directory.create(deployer.master_dict['pki_subsystem_registry_path']) - deployer.file.copy(deployer.master_dict['pki_default_deployment_cfg'], - deployer.master_dict['pki_default_deployment_cfg_replica']) + deployer.directory.create(deployer.mdict['pki_registry_path']) + deployer.directory.create(deployer.mdict['pki_instance_type_registry_path']) + deployer.directory.create(deployer.mdict['pki_instance_registry_path']) + deployer.directory.create(deployer.mdict['pki_subsystem_registry_path']) + deployer.file.copy(deployer.mdict['pki_default_deployment_cfg'], + deployer.mdict['pki_default_deployment_cfg_replica']) - print "Storing deployment configuration into " + deployer.master_dict['pki_user_deployment_cfg_replica'] + "." + print "Storing deployment configuration into " + deployer.mdict['pki_user_deployment_cfg_replica'] + "." # Archive the user deployment configuration excluding the sensitive parameters - sensitive_parameters = deployer.master_dict['sensitive_parameters'].split() + sensitive_parameters = deployer.mdict['sensitive_parameters'].split() sections = config.user_config.sections() for s in sections: for k in sensitive_parameters: config.user_config.set(s, k, 'XXXXXXXX') - with open(deployer.master_dict['pki_user_deployment_cfg_replica'], 'w') as f: + with open(deployer.mdict['pki_user_deployment_cfg_replica'], 'w') as f: config.user_config.write(f) # establish top-level infrastructure, instance, and subsystem # base directories and create the "registry" symbolic link that # the "pkidestroy" executable relies upon - deployer.directory.create(deployer.master_dict['pki_path']) - deployer.directory.create(deployer.master_dict['pki_instance_path']) - deployer.directory.create(deployer.master_dict['pki_subsystem_path']) - deployer.symlink.create(deployer.master_dict['pki_instance_registry_path'], - deployer.master_dict['pki_subsystem_registry_link']) + deployer.directory.create(deployer.mdict['pki_path']) + deployer.directory.create(deployer.mdict['pki_instance_path']) + deployer.directory.create(deployer.mdict['pki_subsystem_path']) + deployer.symlink.create(deployer.mdict['pki_instance_registry_path'], + deployer.mdict['pki_subsystem_registry_link']) # # NOTE: If "infrastructure_layout" scriptlet execution has been # successfully executed to this point, the "pkidestroy" command @@ -85,11 +85,11 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): # no need to establish top-level infrastructure logs # since it now stores 'pkispawn'/'pkidestroy' logs # and will already exist - # deployer.directory.create(deployer.master_dict['pki_log_path']) + # deployer.directory.create(deployer.mdict['pki_log_path']) # establish top-level infrastructure configuration - if deployer.master_dict['pki_configuration_path'] != \ + if deployer.mdict['pki_configuration_path'] != \ config.PKI_DEPLOYMENT_CONFIGURATION_ROOT: - deployer.directory.create(deployer.master_dict['pki_configuration_path']) + deployer.directory.create(deployer.mdict['pki_configuration_path']) return self.rv def destroy(self, deployer): @@ -97,18 +97,18 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): config.pki_log.info(log.ADMIN_DOMAIN_DESTROY_1, __name__, extra=config.PKI_INDENTATION_LEVEL_1) # remove top-level infrastructure base - if deployer.master_dict['pki_subsystem'] in config.PKI_SUBSYSTEMS and\ + if deployer.mdict['pki_subsystem'] in config.PKI_SUBSYSTEMS and\ deployer.instance.pki_instance_subsystems() == 0: # remove top-level infrastructure base - deployer.directory.delete(deployer.master_dict['pki_path']) + deployer.directory.delete(deployer.mdict['pki_path']) # do NOT remove top-level infrastructure logs # since it now stores 'pkispawn'/'pkidestroy' logs - # deployer.directory.delete(deployer.master_dict['pki_log_path']) + # deployer.directory.delete(deployer.mdict['pki_log_path']) # remove top-level infrastructure configuration - if deployer.directory.is_empty(deployer.master_dict['pki_configuration_path'])\ - and deployer.master_dict['pki_configuration_path'] != \ + if deployer.directory.is_empty(deployer.mdict['pki_configuration_path'])\ + and deployer.mdict['pki_configuration_path'] != \ config.PKI_DEPLOYMENT_CONFIGURATION_ROOT: - deployer.directory.delete(deployer.master_dict['pki_configuration_path']) + deployer.directory.delete(deployer.mdict['pki_configuration_path']) # remove top-level infrastructure registry - deployer.directory.delete(deployer.master_dict['pki_registry_path']) + deployer.directory.delete(deployer.mdict['pki_registry_path']) return self.rv |