From 79b88660908a8c7401de8b04208df4c66f611d2e Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Thu, 30 Jun 2016 12:25:35 -0600 Subject: [PATCH] Revert "Use ansible_user instead of ansible_ssh_user" This reverts commit 7cc43cf253fc0dceea381ff11ed1d3e546f70ff8. --- ansible_managed.yml | 2 +- roles/testnode/tasks/user.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible_managed.yml b/ansible_managed.yml index f4a279b..8a94bd4 100644 --- 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 8153351..cc127e8 100644 --- 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 -- 2.39.5