Revert "Use ansible_user instead of ansible_ssh_user"

This reverts commit 7cc43cf253fc0dceea381ff11ed1d3e546f70ff8.

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

diff --git a/roles/testnode/tasks/user.yml b/roles/testnode/tasks/user.yml
index 81533513735dc2b881def84debf02c90adde6d3f..cc127e8078a9bc321785bbac2d24b8bba0567081 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_user
+  when: teuthology_user != ansible_ssh_user
   register: teuthology_user_existence
 
 # If the teuthology_user was just created, delete its password