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

Update Vagrant provisionning (master).
This commit is contained in:
Nicolas Maillat
2017-05-10 12:10:17 +02:00
committed by GitHub
3 changed files with 9 additions and 6 deletions

View File

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

View File

@@ -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

View File

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