Use ansible's new '*become*' options

The old '*sudo*' options are deprecated.

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

diff --git a/roles/paddles/tasks/setup_db.yml b/roles/paddles/tasks/setup_db.yml
index 37b31fe3d38e266064b09d4370899e6e0a1edcc2..347b7a8f737af9719cf22ca8c1f30616a0945be7 100644 (file)
--- a/roles/paddles/tasks/setup_db.yml
+++ b/roles/paddles/tasks/setup_db.yml
@@ -2,7 +2,7 @@
 - name: Create the postgresql database
   postgresql_db:
     name: paddles
-  sudo_user: postgres
+  become_user: postgres
   register: create_db
 
 - name: Set up access to the database
@@ -10,14 +10,14 @@
     db: paddles
     name: "{{ paddles_user }}"
     password: "{{ db_pass }}"
-  sudo_user: postgres
+  become_user: postgres
   when: create_db|changed
 
 - name: Run pecan populate
   command: ./virtualenv/bin/pecan populate prod.py
   args:
     chdir: "{{ paddles_repo_path }}"
-  sudo_user: "{{ paddles_user }}"
+  become_user: "{{ paddles_user }}"
   when: create_db|changed
 
 - name: Copy alembic config template to alembic.ini
@@ -26,7 +26,7 @@
     creates: alembic.ini
     chdir: "{{ paddles_repo_path }}"
   register: alembic_ini
-  sudo_user: "{{ paddles_user }}"
+  become_user: "{{ paddles_user }}"
 
 - name: Update alembic.ini
   lineinfile:
@@ -39,4 +39,4 @@
   args:
     chdir: "{{ paddles_repo_path }}"
   when: alembic_ini|changed
-  sudo_user: "{{ paddles_user }}"
+  become_user: "{{ paddles_user }}"

diff --git a/roles/paddles/tasks/setup_paddles.yml b/roles/paddles/tasks/setup_paddles.yml
index bb29d80cdd29ad96bc21efe5ba6837ea1d19210d..050cddedc533cf6cbdda48c53b003d382f4f3a3a 100644 (file)
--- a/roles/paddles/tasks/setup_paddles.yml
+++ b/roles/paddles/tasks/setup_paddles.yml
@@ -3,7 +3,7 @@
   git:
     repo: "{{ paddles_repo }}"
     dest: "{{ paddles_repo_path }}"
-  sudo_user: "{{ paddles_user }}"
+  become_user: "{{ paddles_user }}"
   tags:
     - repos
 
@@ -12,14 +12,14 @@
     chdir: "{{ paddles_repo_path }}"
     requirements: "./requirements.txt"
     virtualenv: "{{ paddles_repo_path }}/virtualenv"
-  sudo_user: "{{ paddles_user }}"
+  become_user: "{{ paddles_user }}"
 
 - name: Run setup inside virtualenv
   command: "./virtualenv/bin/python setup.py develop"
   args:
     chdir: "{{ paddles_repo_path }}"
   changed_when: false
-  sudo_user: "{{ paddles_user }}"
+  become_user: "{{ paddles_user }}"
 
 - name: Ship prod.py
   template:

diff --git a/roles/pulpito/tasks/main.yml b/roles/pulpito/tasks/main.yml
index 5376b1c7319dc7cadc37158cb3615dc98669a756..c5fca97b1675638fcd44c869bac1e7358d926ce0 100644 (file)
--- a/roles/pulpito/tasks/main.yml
+++ b/roles/pulpito/tasks/main.yml
@@ -24,7 +24,7 @@
   git:
     repo: "{{ pulpito_repo }}"
     dest: "{{ pulpito_repo_path }}"
-  sudo_user: pulpito
+  become_user: pulpito
 
 - name: Look for the virtualenv
   stat: 
@@ -35,7 +35,7 @@
 
 - name: Create the virtualenv
   shell: virtualenv ./virtualenv chdir={{ pulpito_repo_path }}
-  sudo_user: pulpito
+  become_user: pulpito
   when: virtualenv.stat.exists == false
 
 - name: Install requirements via pip
@@ -44,7 +44,7 @@
     requirements: "./requirements.txt"
     virtualenv: "{{ pulpito_repo_path }}/virtualenv"
   no_log: true
-  sudo_user: pulpito
+  become_user: pulpito
 
 - name: Check for pulpito config
   stat:
@@ -56,7 +56,7 @@
 - name: Copy pulpito config
   shell: cp ./config.py.in prod.py chdir={{ pulpito_repo_path }}
   when: pulpito_config.stat.exists == false
-  sudo_user: pulpito
+  become_user: pulpito
 
 - name: Set paddles_address
   lineinfile:

diff --git a/roles/sudo/defaults/main.yml b/roles/sudo/defaults/main.yml
index 8e62cf6842c243be682b10045ad0a0f58f6e17c8..4b6d44dffc7e21a1c8b0ba963dca4629bd438b8f 100644 (file)
--- a/roles/sudo/defaults/main.yml
+++ b/roles/sudo/defaults/main.yml
@@ -1,3 +1,3 @@
 ---
 # ensures that sudo will be used for all tasks
-ansible_sudo: true
+ansible_become: true

diff --git a/roles/teuthology/tasks/setup_users.yml b/roles/teuthology/tasks/setup_users.yml
index f1b39d12b54b3615da6b5b8946b69c1fa337f788..7ac0f30b033bb25877c395e72733e4d4d6fd7ba4 100644 (file)
--- a/roles/teuthology/tasks/setup_users.yml
+++ b/roles/teuthology/tasks/setup_users.yml
@@ -12,7 +12,7 @@
   git:
     repo: "{{ teuthology_repo }}"
     dest: /home/{{ item }}/src/teuthology_master
-  sudo_user: "{{ item }}"
+  become_user: "{{ item }}"
   with_items: "{{ teuthology_users }}"
   tags:
     - repos
@@ -21,7 +21,7 @@
   shell: NO_CLOBBER=true ./bootstrap
   args:
     chdir: /home/{{ item }}/src/teuthology_master/
-  sudo_user: "{{ item }}"
+  become_user: "{{ item }}"
   with_items: "{{ teuthology_users }}"
   register: bootstrap
   changed_when: bootstrap.stdout_lines[-1]|length > 60
@@ -33,13 +33,13 @@
     dest: /home/{{ item }}/.profile
     regexp: teuthology_master
     line: 'PATH="$HOME/src/teuthology_master/virtualenv/bin:$PATH"'
-  sudo_user: "{{ item }}"
+  become_user: "{{ item }}"
   with_items: "{{ teuthology_users }}"
 
 - name: Ensure teuthology is usable
   shell: "./teuthology --version"
   args:
     chdir: /home/{{ item }}/src/teuthology_master/virtualenv/bin/
-  sudo_user: "{{ item }}"
+  become_user: "{{ item }}"
   with_items: "{{ teuthology_users }}"
   changed_when: false