Zach Isbach 4 лет назад
Родитель
Сommit
456ba74349

+ 1 - 1
plays/roles/docker_glusterfs/tasks/main.yml

@@ -40,7 +40,7 @@
   ansible.posix.mount:
     path: "{{ docker_glusterfs_hostssl }}"
     src: "{{ docker_glusterfs_pluginssl }}"
-    opts: bind
+    opts: bind,noauto
     fstype: none
     state: mounted
 

+ 15 - 29
plays/roles/gluster/tasks/main.yml

@@ -8,33 +8,19 @@
     path: "{{ item }}"
     owner: "{{ gluster_owner }}"
     group: "{{ gluster_group }}"
-    mode: 0750
+    mode: '0750'
     state: directory
   loop: [ "{{ gluster_datadir }}", "{{ gluster_keydir }}", "{{ gluster_libmnt }}" ]
-
-- name: Init alternate libdir
-  file:
-    path: "{{ gluster_libmnt }}"
-    owner: "{{ gluster_owner }}"
-    group: "{{ gluster_group }}"
-    mode: 0750
-    state: directory
-  when: gluster_libdev is defined
 - name: Mount gluster lib storage
-  ansible.posix.mount:
-    path: "{{ gluster_libmnt }}"
-    src: "{{ gluster_libdev }}"
-    fstype: xfs
-    opts: defaults,noatime
-    state: mounted
-  when: gluster_libdev is defined
-- name: Secure alternate libdir
-  file:
-    path: "{{ gluster_libmnt }}"
-    owner: "{{ gluster_owner }}"
-    group: "{{ gluster_group }}"
-    mode: 0750
-    state: directory
+  include_role:
+    name: mount
+  vars:
+    mount_dev: "{{ gluster_libdev }}"
+    mount_path: "{{ gluster_libmnt }}"
+    mount_owner: "{{ gluster_owner }}"
+    mount_group: "{{ gluster_group }}"
+    mount_mode: '0750'
+    mount_fs: xfs
   when: gluster_libdev is defined
 
 - name: Install the TLS CA
@@ -43,7 +29,7 @@
     dest: "{{ gluster_keydir }}/ca.pem"
     owner: "{{ gluster_owner }}"
     group: "{{ gluster_group }}"
-    mode: 0400
+    mode: '0400'
   register: gluster_copy
   changed_when: gluster_copy.src is defined
   when: gluster_ca is defined
@@ -54,7 +40,7 @@
     dest: "{{ gluster_keydir }}/node.pem"
     owner: "{{ gluster_owner }}"
     group: "{{ gluster_group }}"
-    mode: 0400
+    mode: '0400'
   register: gluster_copy
   changed_when: gluster_copy.src is defined
   when: gluster_tls_name is defined
@@ -65,7 +51,7 @@
     dest: "{{ gluster_keydir }}/node.key"
     owner: "{{ gluster_owner }}"
     group: "{{ gluster_group }}"
-    mode: 0400
+    mode: '0400'
   register: gluster_copy
   changed_when: gluster_copy.src is defined
   when: gluster_tls_name is defined
@@ -76,7 +62,7 @@
     path: "{{ gluster_ssldir }}"
     owner: root
     group: root
-    mode: 0755
+    mode: '0755'
     state: directory
   when: gluster_cert is defined or gluster_ca is defined
   notify: gluster_restart
@@ -113,7 +99,7 @@
     path: "{{ gluster_secure }}"
     owner: "{{ gluster_owner }}"
     group: "{{ gluster_group }}"
-    mode: 0640
+    mode: '0640'
     state: touch
   register: gluster_touch
   when: gluster_cert is defined or gluster_ca is defined

+ 1 - 1
plays/roles/gluster_mnt/tasks/main.yml

@@ -15,4 +15,4 @@
     mount_group: "{{ gluster_mnt_grp }}" 
     mount_dev: "{{ gluster_mnt_srv }}:/{{ gluster_mnt_vol }}"
     mount_fs: glusterfs
-    mount_opts: "defaults,_netdev,noatime,backupvolfile-server={{ gluster_mnt_bkp }}"
+    mount_opts: "defaults,_netdev,noauto,noatime,backupvolfile-server={{ gluster_mnt_bkp }}"

+ 9 - 15
plays/roles/gluster_vol/tasks/main.yml

@@ -3,22 +3,16 @@
     name: "{{ gluster_vol_group }}"
     gid: "{{ gluster_vol_gid }}"
     state: present
-- name: Init volume mountpoint
-  file:
-    path: "{{ gluster_vol_datadir }}"
-    owner: "{{ gluster_vol_owner }}"
-    group: "{{ gluster_vol_group }}"
-    mode: "{{ gluster_vol_perms }}"
-    state: directory
-  when: gluster_vol_dev is defined
 - name: Mount the data dev
-  ansible.posix.mount:
-    path: "{{ gluster_vol_datadir }}"
-    src: "{{ gluster_vol_dev }}"
-    fstype: xfs
-    opts: defaults,noatime
-    state: mounted
-  register: gluster_vol_mounted
+  include_role:
+    name: mount
+  vars:
+    mount_path: "{{ gluster_vol_datadir }}"
+    mount_owner: "{{ gluster_vol_owner }}"
+    mount_group: "{{ gluster_vol_group }}"
+    mount_mode: "{{ gluster_vol_perms }}"
+    mount_dev: "{{ gluster_vol_dev }}"
+    mount_fs: xfs
   notify: gluster_vol_restart
   when: gluster_vol_dev is defined
 - name: Init volume paths

+ 2 - 3
plays/roles/key_store/tasks/main.yml

@@ -118,10 +118,9 @@
   include_role:
     name: mount
   vars:
+    mount_dev: "/dev/mapper/{{ key_store_crypt }}"
     mount_path: "{{ key_store_datadir }}"
     mount_owner: "{{ key_store_owner }}"
     mount_group: "{{ key_store_group }}"
     mount_mode: '0750'
-    mount_dev: "/dev/mapper/{{ key_store_crypt }}"
-    mount_fs: xfs
-    mount_opts: "defaults,noatime"
+    mount_fs: xfs

+ 1 - 0
plays/roles/mount/defaults/main.yml

@@ -1,3 +1,4 @@
 mount_owner: root
 mount_group: root
 mount_mode: '0755'
+mount_opts: "defaults,noauto,noatime"