Use ansible_user instead of ansible_ssh_user

The option was renamed in 2.0

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

diff --git a/ansible_managed.yml b/ansible_managed.yml
index fa402926641b090bb82349672a849d7e5de09e63..f40bf6d97600c54eda5e8b87b758e3732bec6642 100644 (file)
--- a/ansible_managed.yml
+++ b/ansible_managed.yml
@@ -5,6 +5,6 @@
   # assuming the nodes we run this on will most likely
   # have an ubuntu user already created.
   vars:
-    ansible_ssh_user: ubuntu
+    ansible_user: ubuntu
   roles:
     - ansible-managed

diff --git a/roles/testnode/tasks/user.yml b/roles/testnode/tasks/user.yml
index cc127e8078a9bc321785bbac2d24b8bba0567081..81533513735dc2b881def84debf02c90adde6d3f 100644 (file)
--- a/roles/testnode/tasks/user.yml
+++ b/roles/testnode/tasks/user.yml
@@ -21,7 +21,7 @@
     state: present
   # If we're currently running as teuthology_user, we won't be able to modify
   # the account
-  when: teuthology_user != ansible_ssh_user
+  when: teuthology_user != ansible_user
   register: teuthology_user_existence
 
 # If the teuthology_user was just created, delete its password