Remove sudo role; replace with 'become' setting

The old method of setting the default behavior for become/sudo has
changed in 2.x; fortunately the new way is a bit more elegant

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/ansible_managed.yml b/ansible_managed.yml
index f40bf6d97600c54eda5e8b87b758e3732bec6642..f4a279b87a8f149f4d9fecfd6b62313a8b3863e1 100644 (file)
--- a/ansible_managed.yml
+++ b/ansible_managed.yml
@@ -8,3 +8,4 @@
     ansible_user: ubuntu
   roles:
     - ansible-managed
+  become: true

diff --git a/nameserver.yml b/nameserver.yml
index 71432661b64356cbd69c3bb9603544eaca542eaa..677810acb3a8258d666eefc8705265cea6e0ac2e 100644 (file)
--- a/nameserver.yml
+++ b/nameserver.yml
@@ -3,3 +3,4 @@
   roles:
     - common
     - nameserver
+  become: true

diff --git a/paddles.yml b/paddles.yml
index 17e91eaa0253b082ef868143a104ef6fd5994afb..b4e8b243b0b8a93bec74bd9e8d118314387e1dac 100644 (file)
--- a/paddles.yml
+++ b/paddles.yml
@@ -3,3 +3,4 @@
   roles:
     - common
     - paddles
+  become: true

diff --git a/pcp.yml b/pcp.yml
index ef7751053d171ed02edff1b3567d18f4b23a9b56..6498faf7cf7d93192efb55867d1bca505b123f4e 100644 (file)
--- a/pcp.yml
+++ b/pcp.yml
@@ -2,3 +2,4 @@
 - hosts: pcp
   roles:
     - pcp
+  become: true

diff --git a/roles/ansible-managed/meta/main.yml b/roles/ansible-managed/meta/main.yml
deleted file mode 100644 (file)
index bbd5ff0..0000000
--- a/roles/ansible-managed/meta/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-dependencies:
-  - role: sudo

diff --git a/roles/common/meta/main.yml b/roles/common/meta/main.yml
index 899d36b3e203bf7593a69a1da4fd160790527c4f..ebe0d988f45cf065d99ec8d07540f07a1efd6da9 100644 (file)
--- a/roles/common/meta/main.yml
+++ b/roles/common/meta/main.yml
@@ -1,6 +1,5 @@
 ---
 dependencies:
-  - role: sudo
   - role: secrets
   - role: users
   

diff --git a/roles/nameserver/meta/main.yml b/roles/nameserver/meta/main.yml
index 77a29a7faa6064d146724d2f40976aab19821ed9..313fd690f5044eac9e181196dbe7e33b1be37fe4 100644 (file)
--- a/roles/nameserver/meta/main.yml
+++ b/roles/nameserver/meta/main.yml
@@ -1,4 +1,3 @@
 ---
 dependencies:
   - role: secrets
-  - role: sudo

diff --git a/roles/paddles/meta/main.yml b/roles/paddles/meta/main.yml
index 1e71b66540eb4dcc54d7f13c4a0335e54a0ad4ba..3413ff83591a2debf5ce2d1be1b062541fe5aff2 100644 (file)
--- a/roles/paddles/meta/main.yml
+++ b/roles/paddles/meta/main.yml
@@ -1,5 +1,4 @@
 ---
 dependencies:
   - role: secrets
-  - role: sudo
   - role: users

diff --git a/roles/pcp/meta/main.yml b/roles/pcp/meta/main.yml
deleted file mode 100644 (file)
index bbd5ff0..0000000
--- a/roles/pcp/meta/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-dependencies:
-  - role: sudo

diff --git a/roles/sudo/README.rst b/roles/sudo/README.rst
deleted file mode 100644 (file)
index 0de5ca0..0000000
--- a/roles/sudo/README.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Sudo
-====
-
-This role is mainly used as a dependancy for others. If you add this role as a dependancy
-to another it will ensure that all tasks in that role will use sudo.

diff --git a/roles/sudo/defaults/main.yml b/roles/sudo/defaults/main.yml
deleted file mode 100644 (file)
index 4b6d44d..0000000
--- a/roles/sudo/defaults/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-# ensures that sudo will be used for all tasks
-ansible_become: true

diff --git a/roles/testnode/meta/main.yml b/roles/testnode/meta/main.yml
index 77a29a7faa6064d146724d2f40976aab19821ed9..313fd690f5044eac9e181196dbe7e33b1be37fe4 100644 (file)
--- a/roles/testnode/meta/main.yml
+++ b/roles/testnode/meta/main.yml
@@ -1,4 +1,3 @@
 ---
 dependencies:
   - role: secrets
-  - role: sudo

diff --git a/roles/teuthology/meta/main.yml b/roles/teuthology/meta/main.yml
index a4b782aa2aae25145287551ade891e3b434c44a9..72869df503c40b18e481885906774b6d5bb9603d 100644 (file)
--- a/roles/teuthology/meta/main.yml
+++ b/roles/teuthology/meta/main.yml
@@ -1,4 +1,3 @@
 ---
 dependencies:
-  - role: sudo
   - role: users

diff --git a/testnodes.yml b/testnodes.yml
index 0c93be257846815310fbfbd1a6732b0ef6d8f30a..4d00508febf66719774142efb14735788efdcb8d 100644 (file)
--- a/testnodes.yml
+++ b/testnodes.yml
@@ -3,3 +3,4 @@
   roles:
     - common
     - testnode
+  become: true

diff --git a/teuthology.yml b/teuthology.yml
index 5903e0b2dffb865c94ba238a901aa33c9f0d2143..8efde4921bcc95c931c4b38e97a0f476e5ffdaa4 100644 (file)
--- a/teuthology.yml
+++ b/teuthology.yml
@@ -3,3 +3,4 @@
   roles:
     - common
     - teuthology
+  become: true