diff --git a/group_vars/all b/group_vars/all index f685ab7..4d65145 100644 --- a/group_vars/all +++ b/group_vars/all @@ -6,7 +6,8 @@ docker_ce_version_to_install: 17.09.1~ce-0~ubuntu nvm_version: v0.33.5 node_version: 8.4.0 registry_location: "registry.wimer.home:5000" -nfs_location: 10.0.0.150 +nfs_location: 10.0.0.150i +nfs_share:/volumeUSB5/usbshare home_pub_key: https://raw.githubusercontent.com/jcwimer/ubuntu-template/master/post/id_rsa.pub standard_user: cody git_user: "Jacob Cody Wimer" diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 2895c62..bc304fd 100644 --- a/roles/common/tasks/main.yml +++ b/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 diff --git a/roles/developer-machine/tasks/main.yml b/roles/developer-machine/tasks/main.yml index a751812..b710387 100644 --- a/roles/developer-machine/tasks/main.yml +++ b/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