Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-138-Make-logging-more-informative d90194dcf -> e2655e48b
wip Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/e2655e48 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/e2655e48 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/e2655e48 Branch: refs/heads/ARIA-138-Make-logging-more-informative Commit: e2655e48b5837adf545fb0fb0f7f810a18e38120 Parents: d90194d Author: max-orlov <ma...@gigaspaces.com> Authored: Wed Apr 19 20:06:48 2017 +0300 Committer: max-orlov <ma...@gigaspaces.com> Committed: Wed Apr 19 20:06:48 2017 +0300 ---------------------------------------------------------------------- aria/orchestrator/execution_plugin/instantiation.py | 4 ++-- aria/orchestrator/execution_plugin/ssh/operations.py | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e2655e48/aria/orchestrator/execution_plugin/instantiation.py ---------------------------------------------------------------------- diff --git a/aria/orchestrator/execution_plugin/instantiation.py b/aria/orchestrator/execution_plugin/instantiation.py index 7627a38..db33cf3 100644 --- a/aria/orchestrator/execution_plugin/instantiation.py +++ b/aria/orchestrator/execution_plugin/instantiation.py @@ -73,8 +73,8 @@ def _configure_remote(operation, configuration, arguments): if ('password' not in ssh) and ('key' not in ssh) and ('key_filename' not in ssh): ssh['password'] = default_password - arguments['use_sudo'] = ssh.get('use_sudo') - arguments['hide_output'] = ssh.get('hide_output') + arguments['use_sudo'] = ssh.get('use_sudo', False) + arguments['hide_output'] = ssh.get('hide_output', dict(everything=False)) arguments['fabric_env'] = {} if 'warn_only' in ssh: arguments['fabric_env']['warn_only'] = ssh['warn_only'] http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e2655e48/aria/orchestrator/execution_plugin/ssh/operations.py ---------------------------------------------------------------------- diff --git a/aria/orchestrator/execution_plugin/ssh/operations.py b/aria/orchestrator/execution_plugin/ssh/operations.py index 7147a30..e6ad380 100644 --- a/aria/orchestrator/execution_plugin/ssh/operations.py +++ b/aria/orchestrator/execution_plugin/ssh/operations.py @@ -144,6 +144,9 @@ def _fabric_env(ctx, fabric_env, warn_only): env.update(fabric_env or {}) env.setdefault('warn_only', warn_only) # validations + env['host_string'] = \ + ctx.model.node_template.get_by_name('virtual_ip').nodes[0].runtime_properties['floating_ip_address'] + if (not env.get('host_string')) and (ctx.task) and (ctx.task.actor) and (ctx.task.actor.host): env['host_string'] = ctx.task.actor.host.host_address if not env.get('host_string'):
