diff options
Diffstat (limited to 'morphlib/plugins/deploy_plugin.py')
| -rw-r--r-- | morphlib/plugins/deploy_plugin.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/morphlib/plugins/deploy_plugin.py b/morphlib/plugins/deploy_plugin.py index 89b88373..c4753f4c 100644 --- a/morphlib/plugins/deploy_plugin.py +++ b/morphlib/plugins/deploy_plugin.py @@ -55,9 +55,9 @@ def configuration_for_system(system_id, vars_from_commandline, # Order is important here: the second dict overrides the first, the third # overrides the second. - final_env = dict(deploy_defaults.items() + - deploy_params.items() + - user_env.items()) + final_env = dict(list(deploy_defaults.items()) + + list(deploy_params.items()) + + list(user_env.items())) morphlib.util.sanitize_environment(final_env) @@ -355,7 +355,7 @@ class DeployPlugin(cliapp.Plugin): all_deployments = set() deployments = set() for system in cluster_morphology['systems']: - all_deployments.update(system['deploy'].iterkeys()) + all_deployments.update(system['deploy'].keys()) if 'subsystems' in system: all_subsystems.update(loader._get_subsystem_names(system)) for item in args[1:]: @@ -419,7 +419,7 @@ class DeployPlugin(cliapp.Plugin): found[a.source.name].append(a) else: found[a.source.name] = [a] - for name, artifacts in found.iteritems(): + for name, artifacts in found.items(): if artifacts[0].source.filename in not_found: not_found.remove(artifacts[0].source.filename) return found, not_found @@ -443,7 +443,7 @@ class DeployPlugin(cliapp.Plugin): def deploy_system(self, deploy_tempdir, definitions_repo, system, env_vars, deployment_filter, parent_location): - sys_ids = set(system['deploy'].iterkeys()) + sys_ids = set(system['deploy'].keys()) if deployment_filter and not \ any(sys_id in deployment_filter for sys_id in sys_ids): return @@ -472,7 +472,7 @@ class DeployPlugin(cliapp.Plugin): artifact = build_command.resolve_artifacts(source_pool) deploy_defaults = system.get('deploy-defaults', {}) - for system_id, deploy_params in system['deploy'].iteritems(): + for system_id, deploy_params in system['deploy'].items(): if not system_id in deployment_filter and deployment_filter: continue deployment_status_prefix = '%s[%s]' % ( @@ -653,7 +653,7 @@ class DeployPlugin(cliapp.Plugin): self.app.status(msg='Unpacking components for deployment') unpacked = set() - for name, artifacts in components.iteritems(): + for name, artifacts in components.items(): for artifact in artifacts: if not (bc.lac.has(artifact) or bc.rac.has(artifact)): raise NotYetBuiltError(name, bc.rac) @@ -791,7 +791,7 @@ class DeployPlugin(cliapp.Plugin): def remove_passwords(env): is_password = morphlib.util.env_variable_is_password - return { k:v for k, v in env.iteritems() if not is_password(k) } + return { k:v for k, v in env.items() if not is_password(k) } meta = { 'system-artifact-name': system_artifact.name, |