From ac4dc1f739e813d6542b4e37e968c62f57511de4 Mon Sep 17 00:00:00 2001 From: Kishin Yagami Date: Sun, 17 Aug 2014 11:47:59 +0900 Subject: [PATCH] enable environment keyword at play level --- lib/ansible/playbook/play.py | 5 +++-- lib/ansible/playbook/task.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/ansible/playbook/play.py b/lib/ansible/playbook/play.py index 0dcbca86841..1bc0a893baf 100644 --- a/lib/ansible/playbook/play.py +++ b/lib/ansible/playbook/play.py @@ -38,7 +38,7 @@ class Play(object): 'accelerate_port', 'accelerate_ipv6', 'sudo', 'sudo_user', 'transport', 'playbook', 'tags', 'gather_facts', 'serial', '_ds', '_handlers', '_tasks', 'basedir', 'any_errors_fatal', 'roles', 'max_fail_pct', '_play_hosts', 'su', 'su_user', - 'vault_password', 'no_log', + 'vault_password', 'no_log', 'environment', ] # to catch typos and so forth -- these are userland names @@ -48,7 +48,7 @@ class Play(object): 'tasks', 'handlers', 'remote_user', 'user', 'port', 'include', 'accelerate', 'accelerate_port', 'accelerate_ipv6', 'sudo', 'sudo_user', 'connection', 'tags', 'gather_facts', 'serial', 'any_errors_fatal', 'roles', 'role_names', 'pre_tasks', 'post_tasks', 'max_fail_percentage', - 'su', 'su_user', 'vault_password', 'no_log', + 'su', 'su_user', 'vault_password', 'no_log', 'environment', ] # ************************************************* @@ -71,6 +71,7 @@ class Play(object): self.roles = ds.get('roles', None) self.tags = ds.get('tags', None) self.vault_password = vault_password + self.environment = ds.get('environment', {}) if self.tags is None: self.tags = [] diff --git a/lib/ansible/playbook/task.py b/lib/ansible/playbook/task.py index 783f488fa10..bdffba5527c 100644 --- a/lib/ansible/playbook/task.py +++ b/lib/ansible/playbook/task.py @@ -133,7 +133,7 @@ class Task(object): self.register = ds.get('register', None) self.sudo = utils.boolean(ds.get('sudo', play.sudo)) self.su = utils.boolean(ds.get('su', play.su)) - self.environment = ds.get('environment', {}) + self.environment = ds.get('environment', play.environment) self.role_name = role_name self.no_log = utils.boolean(ds.get('no_log', "false")) or self.play.no_log self.run_once = utils.boolean(ds.get('run_once', 'false'))