From: Zack Cerza Date: Mon, 27 Jun 2016 18:50:38 +0000 (-0600) Subject: Remove sudo role; replace with 'become' setting X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1ce9045f6a4ab499e8dc18838bcafdc528020876;p=ceph-cm-ansible.git 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 --- diff --git a/ansible_managed.yml b/ansible_managed.yml index f40bf6d9..f4a279b8 100644 --- 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 71432661..677810ac 100644 --- a/nameserver.yml +++ b/nameserver.yml @@ -3,3 +3,4 @@ roles: - common - nameserver + become: true diff --git a/paddles.yml b/paddles.yml index 17e91eaa..b4e8b243 100644 --- a/paddles.yml +++ b/paddles.yml @@ -3,3 +3,4 @@ roles: - common - paddles + become: true diff --git a/pcp.yml b/pcp.yml index ef775105..6498faf7 100644 --- 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 index bbd5ff0d..00000000 --- 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 899d36b3..ebe0d988 100644 --- 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 77a29a7f..313fd690 100644 --- 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 1e71b665..3413ff83 100644 --- 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 index bbd5ff0d..00000000 --- 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 index 0de5ca0b..00000000 --- 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 index 4b6d44df..00000000 --- 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 77a29a7f..313fd690 100644 --- 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 a4b782aa..72869df5 100644 --- 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 0c93be25..4d00508f 100644 --- a/testnodes.yml +++ b/testnodes.yml @@ -3,3 +3,4 @@ roles: - common - testnode + become: true diff --git a/teuthology.yml b/teuthology.yml index 5903e0b2..8efde492 100644 --- a/teuthology.yml +++ b/teuthology.yml @@ -3,3 +3,4 @@ roles: - common - teuthology + become: true