Skip to content

Commit

Permalink
Fix ansible_user references for local provisioning (roots#1479)
Browse files Browse the repository at this point in the history
`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).
  • Loading branch information
swalkinshaw authored and paulbrzeski committed Mar 3, 2023
1 parent fd938b6 commit 817c3e2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion group_vars/development/main.yml
Original file line number Diff line number Diff line change
@@ -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') }}"
2 changes: 1 addition & 1 deletion roles/common/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit 817c3e2

Please sign in to comment.