Merge branch 'master' of https://github.com/jcwimer/homelab-ansible

roles/common/tasks/main.yml

@@ -109,12 +109,12 @@
   lineinfile: dest=/etc/fstab
               regexp=\/data
               state=present
-              line="{{ nfs_location }}:/volumeUSB1/usbshare/raw-files/fileserver/shares/lab-data /data nfs defaults,nolock 0 0"
+              line="{{ nfs_location }}:{{ nfs_share }}/raw-files/fileserver/shares/lab-data /data nfs defaults,nolock 0 0"
 
 - name: Mount USB lab data directory
   mount:
     path: /data
-    src: 10.0.0.150:/volumeUSB1/usbshare/raw-files/fileserver/shares/lab-data
+    src: 10.0.0.150:{{ nfs_share }}/raw-files/fileserver/shares/lab-data
     state: mounted
     fstype: nfs
   ignore_errors: true

roles/configure-interfaces/tasks/main.yml

@@ -10,11 +10,9 @@
   template: src=../roles/configure-interfaces/templates/eth.cfg.j2 dest=/etc/network/interfaces.d/{{ interface_name }}.cfg
 
 - name: Up down interface
-  # shell: bash -c "(ifdown {{ interface_name }} && ifup {{ interface_name }}) &"
-  shell: "(sleep 1; ifdown {{ interface_name }} && ifup {{ interface_name }}) &"
-  #shell: "ifdown --exclude=lo -a; sleep 1; ifup --exclude=lo -a"
-  async: 100
-  poll: 0
+  shell: "(sleep 3s; ifdown {{ interface_name }} && ifup {{ interface_name }};) &"
   ignore_errors: true
   vars:
     interface_name: eth0
+  async: 100
+  poll: 0

roles/developer-machine/tasks/main.yml

@@ -101,13 +101,13 @@
   lineinfile: dest=/etc/fstab
               regexp=\/raw-files
               state=present
-              line="{{ nfs_location }}:/volumeUSB1/usbshare/raw-files /raw-files nfs defaults 0 0"
+              line="{{ nfs_location }}:{{ nfs_share }}/raw-files /raw-files nfs defaults 0 0"
 
 - name: Mount USB raw files to data directory
   when: not raw_mounted.stat.exists
   mount:
     path: /raw-files
-    src: 10.0.0.150:/volumeUSB1/usbshare/raw-files
+    src: 10.0.0.150:{{ nfs_share }}/raw-files
     state: mounted
     fstype: nfs
   ignore_errors: true