Explorar el Código

Merge pull request #202 from leereyno/update-nfs-client-variables

Clarify NFS share variables
Lucas A. Wilson hace 4 años
padre
commit
bc43cd19fe

+ 2 - 2
roles/k8s_nfs_client_setup/tasks/main.yml

@@ -36,7 +36,7 @@
   tags: nfs_client
   tags: nfs_client
 
 
 - name: Mounting NFS Share
 - name: Mounting NFS Share
-  command: "mount {{ groups['manager'][0] }}:{{ nfs_mnt_dir }} {{ nfs_mnt_dir }}"
+  command: "mount {{ mounthost }}:{{ nfs_share_dir }} {{ nfs_mnt_dir }}"
   changed_when: true
   changed_when: true
   args:
   args:
     warn: false
     warn: false
@@ -46,6 +46,6 @@
 - name: Configuring Automount NFS Shares on reboot
 - name: Configuring Automount NFS Shares on reboot
   lineinfile:
   lineinfile:
     path: "{{ fstab_file_path }}"
     path: "{{ fstab_file_path }}"
-    line: "{{ groups['manager'][0] }}:{{ nfs_mnt_dir }}     {{ nfs_mnt_dir }}  nfs     nosuid,rw,sync,hard,intr 0 0"
+    line: "{{ mounthost }}:{{ nfs_share_dir }}     {{ nfs_mnt_dir }}  nfs     nosuid,rw,sync,hard,intr 0 0"
   when: groups['manager'][0] not in mounted_share.stdout
   when: groups['manager'][0] not in mounted_share.stdout
   tags: nfs_client
   tags: nfs_client

+ 4 - 1
roles/k8s_nfs_client_setup/vars/main.yml

@@ -14,7 +14,10 @@
 ---
 ---
 
 
 nfs_mnt_dir: /home/k8snfs
 nfs_mnt_dir: /home/k8snfs
+nfs_share_dir: /home/k8snfs
+
+mounthost: "{{ groups['manager'][0] }}"
 
 
 nfs_mnt_dir_mode: 0755
 nfs_mnt_dir_mode: 0755
 
 
-fstab_file_path: /etc/fstab
+fstab_file_path: /etc/fstab