Move vagrant files into SITE home

All vagrant-generated files are moved to the SITE home. This way there
are no files created in the playbooks tree, which makes it possible to
share it between multiple active environments.

Signed-off-by: Xavi Hernandez <[email protected]>

Author: xhernandez

.gitignore

@@ -1,8 +1,2 @@
 *~
-playbooks/.vagrant
-playbooks/ansible/site_inventory
-playbooks/ansible/ssh-config-setup
-playbooks/site_inventory
-playbooks/ssh-config-host
-playbooks/Vagrantfile
 devel/authorized_keys

playbooks/Makefile

@@ -1,5 +1,5 @@
-INVENTORY := ./site_inventory
-VSSH := ssh -F ssh-config-host
+INVENTORY := "${SITE_HOME}/site_inventory"
+VSSH := ssh -F "${SITE_HOME}/ssh-config-host"
 
 ifdef EXTRA_VARS
 	ANSIBLE_EXTRA_VARS := -e '${EXTRA_VARS}'

playbooks/ansible/roles/common.prep/tasks/main.yml

@@ -23,7 +23,7 @@
 
 - name: copy ssh config
   copy:
-    src: ssh-config-setup
+    src: ~/.ssh/config
     dest: .ssh/config
 
 - name: Create /etc/hosts

playbooks/roles/provisioner.vagrant/tasks/create/main.yml

@@ -2,62 +2,68 @@
 - name: Setup Vagrant file
   template:
     src: Vagrantfile.j2
-    dest: Vagrantfile
+    dest: "{{ config.home }}/Vagrantfile"
 
 - name: start vagrant vms
-  command: vagrant up --no-provision
+  command:
+    chdir: "{{ config.home }}"
+    cmd: vagrant up --no-provision
 
 - name: provision vagrant vms
-  command: vagrant provision
+  command:
+    chdir: "{{ config.home }}"
+    cmd: vagrant provision
 
 - name: copy vagrant generated inventory file - local machine
   copy:
-    src: .vagrant/provisioners/ansible/inventory/vagrant_ansible_inventory
-    dest: ./site_inventory
+    src: "{{ config.home }}/.vagrant/provisioners/ansible/inventory/vagrant_ansible_inventory"
+    dest: "{{ config.home }}/site_inventory"
 
 - name: adapt inventory - ssh options
   blockinfile:
-    path: ./site_inventory
+    path: "{{ config.home }}/site_inventory"
     block: |
       [all:vars]
       ansible_ssh_common_args='-o StrictHostKeyChecking=no'
 
 - name: copy vagrant generated inventory file - setup machine
   copy:
-    src: ./site_inventory
-    dest: ./ansible/site_inventory
+    src: "{{ config.home }}/site_inventory"
+    dest: "{{ config.home }}/site_inventory_setup"
 
 - name: adapt inventory - correct ssh key
   replace:
-    path: ./ansible/site_inventory
+    path: "{{ config.home }}/site_inventory_setup"
     regexp: "ansible_ssh_private_key_file='.*/\\.vagrant\\.d/insecure_private_key'"
     replace: "ansible_ssh_private_key_file='insecure_private_ssh_key'"
 
 - name: dump ssh config
-  command: vagrant ssh-config
+  command:
+    chdir: "{{ config.home }}"
+    cmd: vagrant ssh-config
   register: output
 
 - name: store ssh-config in file
   copy:
     content: "{{ output.stdout }}\n"
-    dest: ./ssh-config-host
+    dest: "{{ config.home }}/ssh-config-host"
 
 - name: Create host alias
   lineinfile:
-    path: ./ssh-config-host
+    path: "{{ config.home }}/ssh-config-host"
     state: present
     regexp: '^\s*Host\s+{{ config.groups[item][0] }}.*$'
     line: "Host {{ config.groups[item][0] }} {{ item }}"
   with_items: "{{ config.groups.keys() }}"
 
 - name: copy ssh-config for setup
   copy:
-    src: ./ssh-config-host
-    dest: ./ansible/ssh-config-setup
+    src: "{{ config.home }}/ssh-config-host"
+    dest: "{{ config.home }}/ssh-config-setup"
 
 - name: modify ssh-config-setup
   replace:
-    path: ./ansible/ssh-config-setup
+    path: "{{ config.home }}/ssh-config-setup"
     regexp: "IdentityFile .*"
     replace: "IdentityFile ansible/insecure_private_ssh_key"
 

playbooks/roles/provisioner.vagrant/tasks/destroy/main.yml

@@ -1,15 +1,17 @@
 ---
 - name: Destroy vagrant machines
-  command: vagrant destroy -f
+  command:
+    chdir: "{{ config.home }}"
+    cmd: vagrant destroy -f
 
 - name: Remove vagrant settings
   file:
-    path: "{{ item }}"
+    path: "{{ config.home }}/{{ item }}"
     state: absent
   with_items:
     - .vagrant
     - Vagrantfile
-    - ansible/site_inventory
-    - ansible/ssh-config-setup
     - site_inventory
+    - site_inventory_setup
     - ssh-config-host
+    - ssh-config-setup

playbooks/roles/provisioner.vagrant/templates/Vagrantfile.j2

@@ -54,7 +54,7 @@ Vagrant.configure("2") do |config|
       # Run a no-op playbook to create the inventory file.
       # Based on that, one can run ansible without vagrant.
         node.vm.provision "no-op", type:'ansible' do |ansible|
-            ansible.playbook = "no-op-playbook.yml"
+            ansible.playbook = "{{ playbook_dir }}/no-op-playbook.yml"
             ansible.groups = {
         {%- for group in config.groups +%}
                 "{{ group }}" => {{ config.groups[group] | to_json }},

playbooks/roles/setup.prep/tasks/main.yml

@@ -26,10 +26,15 @@
 
     - name: copy ssh config in place
       copy:
-        src: ansible/ssh-config-setup
+        src: "{{ config.home }}/ssh-config-setup"
         dest: .ssh/config
         mode: 0600
 
+    - name: Copy inventory
+      copy:
+        src: "{{ config.home }}/site_inventory_setup"
+        dest: ansible/site_inventory
+
     - name: Copy config.yml
       copy:
         src: "{{ config.home }}/config.yml"