Skip to content
This repository has been archived by the owner on Feb 13, 2023. It is now read-only.

Commit

Permalink
Fixes #2024: Fix chicken-and-egg ordering of postgresql database and …
Browse files Browse the repository at this point in the history
…user.
  • Loading branch information
geerlingguy committed Mar 20, 2020
1 parent 9400ee5 commit 59f28f2
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
3 changes: 2 additions & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@ Vagrant.configure('2') do |config|
ansible.playbook = playbook
ansible.extra_vars = {
config_dir: config_dir,
drupalvm_env: drupalvm_env
drupalvm_env: drupalvm_env,
ansible_python_interpreter: vconfig['ansible_python_interpreter']
}
ansible.raw_arguments = Shellwords.shellsplit(ENV['DRUPALVM_ANSIBLE_ARGS']) if ENV['DRUPALVM_ANSIBLE_ARGS']
ansible.tags = ENV['DRUPALVM_ANSIBLE_TAGS']
Expand Down
15 changes: 8 additions & 7 deletions default.config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,11 @@ vagrant_plugins:
- name: vagrant-vbguest
- name: vagrant-hostsupdater

ansible_python_interpreter: /usr/bin/python3

# Minimum required versions.
drupalvm_vagrant_version_min: '1.8.6'
drupalvm_ansible_version_min: '2.5'
drupalvm_vagrant_version_min: '2.2.0'
drupalvm_ansible_version_min: '2.8'

# Force use of ansible_local provisioner, even if Ansible is installed on host.
force_ansible_local: false
Expand Down Expand Up @@ -198,14 +200,13 @@ mysql_users:
priv: "{{ drupal_db_name }}.*:ALL"

# PostgreSQL databases and users.
postgresql_databases:
- name: "{{ drupal_db_name }}"

postgresql_users:
- name: "{{ drupal_db_user }}"
password: "{{ drupal_db_password }}"
db: "{{ drupal_db_name }}"
priv: "ALL"

postgresql_databases:
- name: "{{ drupal_db_name }}"
owner: "{{ drupal_db_user }}"

# Comment out any extra utilities you don't want to install. If you don't want
# to install *any* extras, set this value to an empty set, e.g. `[]`.
Expand Down

0 comments on commit 59f28f2

Please sign in to comment.