From: Zack Cerza Date: Tue, 16 Feb 2016 21:55:19 +0000 (-0700) Subject: Use ansible_user instead of ansible_ssh_user X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=7cc43cf253fc0dceea381ff11ed1d3e546f70ff8;p=ceph-cm-ansible.git Use ansible_user instead of ansible_ssh_user The option was renamed in 2.0 Signed-off-by: Zack Cerza --- diff --git a/ansible_managed.yml b/ansible_managed.yml index fa40292..f40bf6d 100644 --- 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 cc127e8..8153351 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_ssh_user + when: teuthology_user != ansible_user register: teuthology_user_existence # If the teuthology_user was just created, delete its password