Merge pull request #2083 from xrousset78800/fix/update-ansible-provisionning

Update Vagrant provisionning (master).

resources/ansible/roles/mariadb/tasks/main.yml

@@ -3,6 +3,7 @@
 - shell: hostname
   register: current_hostname
 
+
 - name: Add MariaDB-Repository
   sudo: yes
   apt_repository: repo='deb http://mirror6.layerjet.com/mariadb/repo/10.1/ubuntu {{ ansible_distribution_release }} main' state=present
@@ -41,9 +42,9 @@
 - name: mariadb | Create databases
   mysql_db: name={{ item }} state=present login_user=root login_password={{ mariadb.root_password }}
   with_items:
-    - "{{ mariadb.database }}"
-    - "{{ mariadb.databox_db }}"
-    - "{{ mariadb.alt_db }}"
+    - "{{ mariadb.appbox_db }}"
+    - "{{ mariadb.databox_db }}"
+    - "{{ mariadb.alt_databox_db }}"
 
 - name: mariadb | Import dump
   mysql_db: name={{ mariadb.database }} state=import login_user=root login_password={{ mariadb.root_password }} target=/vagrant/{{ mariadb.dump }}

resources/ansible/windows-always.sh

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+sudo ansible-playbook /vagrant/resources/ansible/playbook-always.yml -e hostname=$1 --extra-vars "{\"hostname\": \"$1\", \"postfix\": { \"postfix_domain\": \"$1.vb\" }, \"parade_var\": \"$2\" }" --connection=local

resources/ansible/windows.sh

@@ -25,7 +25,7 @@ sudo apt-get update
 sudo apt-get install -y ansible
 
 # Setup Ansible for Local Use and Run
-cp /vagrant/ansible/inventories/dev /etc/ansible/hosts -f
+cp /vagrant/resources/ansible/inventories/dev /etc/ansible/hosts -f
 chmod 666 /etc/ansible/hosts
-cat /vagrant/ansible/files/authorized_keys >> /home/vagrant/.ssh/authorized_keys
-sudo ansible-playbook /vagrant/ansible/playbook.yml -e hostname=$1 --connection=local
+cat /vagrant/resources/ansible/files/authorized_keys >> /home/vagrant/.ssh/authorized_keys
+sudo ansible-playbook /vagrant/resources/ansible/playbook.yml -e hostname=$1 --connection=local