From 93c9803818d6fe46ece22c6019f0af932f405a42 Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Fri, 20 Mar 2015 21:43:41 -0500 Subject: [PATCH] Removing some leftover debug prints and cleaning up test sample --- v2/ansible/playbook/block.py | 1 - v2/ansible/playbook/helpers.py | 2 -- v2/ansible/playbook/play.py | 1 - v2/samples/roles/test_become_r1/meta/main.yml | 2 +- v2/samples/roles/test_become_r1/tasks/main.yml | 1 - v2/samples/roles/test_become_r2/meta/main.yml | 2 +- v2/samples/roles/test_become_r2/tasks/main.yml | 1 - v2/samples/test_become.yml | 4 ---- 8 files changed, 2 insertions(+), 12 deletions(-) diff --git a/v2/ansible/playbook/block.py b/v2/ansible/playbook/block.py index 2946e83f5e..03957bfe2f 100644 --- a/v2/ansible/playbook/block.py +++ b/v2/ansible/playbook/block.py @@ -147,7 +147,6 @@ class Block(Base, Become, Conditional, Taggable): new_me.block = _dupe_task_list(self.block or [], new_me) new_me.rescue = _dupe_task_list(self.rescue or [], new_me) new_me.always = _dupe_task_list(self.always or [], new_me) - print("new block tasks are: %s" % new_me.block) new_me._parent_block = None if self._parent_block: diff --git a/v2/ansible/playbook/helpers.py b/v2/ansible/playbook/helpers.py index 3ea559d799..0e14720557 100644 --- a/v2/ansible/playbook/helpers.py +++ b/v2/ansible/playbook/helpers.py @@ -37,7 +37,6 @@ def load_list_of_blocks(ds, parent_block=None, role=None, task_include=None, use assert type(ds) in (list, NoneType) block_list = [] - print("in load list of blocks, ds is: %s" % ds) if ds: for block in ds: b = Block.load( @@ -51,7 +50,6 @@ def load_list_of_blocks(ds, parent_block=None, role=None, task_include=None, use ) block_list.append(b) - print("-> returning block list: %s" % block_list) return block_list diff --git a/v2/ansible/playbook/play.py b/v2/ansible/playbook/play.py index 190189aa17..cbe4e03861 100644 --- a/v2/ansible/playbook/play.py +++ b/v2/ansible/playbook/play.py @@ -219,7 +219,6 @@ class Play(Base, Taggable, Become): block_list.extend(self.tasks) block_list.extend(self.post_tasks) - print("block list is: %s" % block_list) return block_list def get_vars(self): diff --git a/v2/samples/roles/test_become_r1/meta/main.yml b/v2/samples/roles/test_become_r1/meta/main.yml index 603a2d53a2..cb58e2857b 100644 --- a/v2/samples/roles/test_become_r1/meta/main.yml +++ b/v2/samples/roles/test_become_r1/meta/main.yml @@ -1 +1 @@ -allow_duplicates: yes +#allow_duplicates: yes diff --git a/v2/samples/roles/test_become_r1/tasks/main.yml b/v2/samples/roles/test_become_r1/tasks/main.yml index 9231d0af98..ef8d396978 100644 --- a/v2/samples/roles/test_become_r1/tasks/main.yml +++ b/v2/samples/roles/test_become_r1/tasks/main.yml @@ -1,2 +1 @@ -- debug: msg="this is test_become_r1" - command: whoami diff --git a/v2/samples/roles/test_become_r2/meta/main.yml b/v2/samples/roles/test_become_r2/meta/main.yml index 9304df73a0..55b258adb4 100644 --- a/v2/samples/roles/test_become_r2/meta/main.yml +++ b/v2/samples/roles/test_become_r2/meta/main.yml @@ -1,3 +1,3 @@ -allow_duplicates: yes +#allow_duplicates: yes dependencies: - test_become_r1 diff --git a/v2/samples/roles/test_become_r2/tasks/main.yml b/v2/samples/roles/test_become_r2/tasks/main.yml index 01d6d31385..ef8d396978 100644 --- a/v2/samples/roles/test_become_r2/tasks/main.yml +++ b/v2/samples/roles/test_become_r2/tasks/main.yml @@ -1,2 +1 @@ -- debug: msg="this is test_become_r2" - command: whoami diff --git a/v2/samples/test_become.yml b/v2/samples/test_become.yml index eb527e5959..b7550f33c7 100644 --- a/v2/samples/test_become.yml +++ b/v2/samples/test_become.yml @@ -1,14 +1,10 @@ - hosts: all gather_facts: no roles: - - { role: test_become_r2 } - { role: test_become_r2, sudo_user: testing } tasks: - - command: whoami - command: whoami become_user: testing - - block: - - command: whoami - block: - command: whoami become_user: testing