Просмотр исходного кода

New volumes
Simplify LVM-gluster handling

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

+ 15 - 0
plays/fragments.yaml

@@ -0,0 +1,15 @@
+  tasks:
+  - name: Remove docker_registry vol
+    gluster.gluster.gluster_volume:
+      state: absent
+      name: docker_register
+  - name: Drop the docker_registry mount
+    ansible.posix.mount:
+      path: /data/gluster/docker_registry
+      state: absent
+  - name: Remove docker_registry LVM
+    community.general.lvol:
+      vg: gluster
+      lv: docker_registry
+      state: absent
+      force: true

+ 8 - 17
plays/gluster-run.yaml

@@ -1,4 +1,4 @@
-- name: Init services
+- name: Gluster services
   hosts: gluster
   become: true
   vars:
@@ -14,24 +14,15 @@
           gluster_libdev: "/dev/mapper/{{ vg }}-{{ lv }}",
           gluster_cluster: "{{ groups.gluster }}"
       }
-
-- name: Run services
+      
+- name: Gluster vols
   hosts: gluster
   become: true
   vars:
-    vg: gluster
-    gluster_vol_cluster: "{{ groups['gluster'] }}"
-    gluster_vol_ssl_allow: "nodeA,nodeB,clnt1,docker_registry"
+    gluster_lvm_vol_vg: gluster
+    gluster_lvm_vol_sslallow: "nodeA,nodeB,clnt1,docker_registry"
   roles:
-    # Docker registry
-    - { role: lvm,
-          lvm_vg: "{{ vg }}",
-          lvm_lv: docker_registry,
-          lvm_size: 2G
-      }
-    - { role: gluster_vol,
-          gluster_vol_name: docker_registry,
-          gluster_vol_dev: "/dev/mapper/{{ vg }}-docker_registry"
+    - { role: gluster_lvm_vol,
+          gluster_lvm_vol_name: docker_registry,
+          docker_lvm_vol_size: 2G,
       }
-    # Add the base user to any new groups
-    - { role: add_group, add_group_groups: 'docker_registry' }

+ 5 - 0
plays/roles/gluster_lvm_vol/defaults/main.yml

@@ -0,0 +1,5 @@
+glutser_lvm_vol_vg: gluster
+gluster_lvm_vol_size: 1G
+gluster_lvm_vol_dev: "/dev/mapper/{{ gluster_lvm_vol_vg }}-{{ gluster_lvm_vol_name }}"
+gluster_lvm_vol_group: "{{ gluster_lvm_vol_name }}"
+gluster_lvm_vol_cluster: "{{ groups[ gluster_lvm_vol_vg ] }}"

+ 22 - 0
plays/roles/gluster_lvm_vol/tasks/main.yml

@@ -0,0 +1,22 @@
+- name: Check group {{ gluster_lvm_vol_group }}
+  include_role:
+    name: add_group
+  vars:
+    add_group_groups: "{{ gluster_lvm_vol_group }}"
+
+- name: Allocate LV {{ gluster_lvm_vol_vg}}-{{ gluster_lvm_vol_name }}
+  include_role:
+    name: lvm
+  vars:
+    lvm_vg: "{{ gluster_lvm_vol_vg }}"
+    lvm_lv: "{{ gluster_lvm_vol_name }}"
+    lvm_size: "{{ gluster_lvm_vol_size }}"
+
+- name: "Start gluster volume {{ gluster_lvm_vol_name }}"
+  include_role:
+    name: gluster_vol
+  vars:
+    gluster_vol_cluster: "{{ gluster_lvm_vol_cluster }}"
+    gluster_vol_name: "{{ gluster_lvm_vol_name }}"
+    gluster_vol_dev: "{{ gluster_lvm_vol_dev }}"
+    gluster_vol_ssl_allow: "{{ gluster_lvm_vol_sslallow | default(omit) }}"

+ 3 - 3
plays/roles/gluster_vol/tasks/main.yml

@@ -1,4 +1,4 @@
-- name: Ensure group {{ gluster_vol_group }} exists
+- name: "Ensure group {{ gluster_vol_group }} exists"
   include_role:
     name: add_group
   vars:
@@ -28,7 +28,7 @@
     state: directory
   loop: [ "{{ gluster_vol_datadir }}", "{{ gluster_vol_brick }}" ]
 
-- name: Create {{ gluster_vol_name }}
+- name: "Create {{ gluster_vol_name }}"
   gluster.gluster.gluster_volume:
     state: present
     start_on_create: false
@@ -70,7 +70,7 @@
 - name: Handlers break
   meta: flush_handlers
 
-- name: Ensure {{ gluster_vol_name }} is started
+- name: "Ensure {{ gluster_vol_name }} is started"
   gluster.gluster.gluster_volume:
     state: started
     name: "{{ gluster_vol_name }}"