From b3e7c5b268436ab105f7f794198186aa71ddd619 Mon Sep 17 00:00:00 2001 From: Scott Walkinshaw Date: Fri, 24 Feb 2023 10:37:53 -0500 Subject: [PATCH] Fix ansible_user references for local provisioning (#1479) `ansible_user` can't be assumed to be defined during Ansible local provisioning (the default mode in Vagrant if Ansible is not installed on the host machine). --- group_vars/development/main.yml | 2 +- roles/common/tasks/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/group_vars/development/main.yml b/group_vars/development/main.yml index 05c01e25b7..7fa791436b 100644 --- a/group_vars/development/main.yml +++ b/group_vars/development/main.yml @@ -1,4 +1,4 @@ acme_tiny_challenges_directory: "{{ www_root }}/letsencrypt" env: development mysql_root_password: "{{ vault_mysql_root_password }}" # Define this variable in group_vars/development/vault.yml -web_user: "{{ ansible_user }}" +web_user: "{{ ansible_user | default ('vagrant') }}" diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 5c0f4e8aa6..cb126400f1 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -172,7 +172,7 @@ - name: Generate SSH key for vagrant user for ansible_local provisioning user: - name: "{{ ansible_user }}" + name: vagrant generate_ssh_key: yes when: vagrant_local_provisioning | default(false)