Bläddra i källkod

Required variables to create dedicated lv (#766)

* Required variables to create dedicated lv

https://bugzilla.redhat.com/show_bug.cgi?id=1490910#c11

* Fixed lint and added distribution to checks
Eduardo Mínguez 7 år sedan
förälder
incheckning
c969394a52

+ 2 - 0
roles/docker-storage-setup/defaults/main.yaml

@@ -3,3 +3,5 @@ docker_dev: "/dev/sdb"
 docker_vg: "docker-vol"
 docker_data_size: "95%VG"
 docker_dm_basesize: "3G"
+container_root_lv_name: "dockerlv"
+container_root_lv_mount_path: "/var/lib/docker"

+ 28 - 7
roles/docker-storage-setup/tasks/main.yaml

@@ -1,8 +1,29 @@
 ---
-- name: create the docker-storage-setup config file
-  template:
-    src: "{{ role_path }}/templates/docker-storage-setup.j2"
-    dest: /etc/sysconfig/docker-storage-setup
-    owner: root
-    group: root
-    mode: 0644
+- block:
+    - name: create the docker-storage config file
+      template:
+        src: "{{ role_path }}/templates/docker-storage-setup-overlayfs.j2"
+        dest: /etc/sysconfig/docker-storage-setup
+        owner: root
+        group: root
+        mode: 0644
+
+  when:
+    - ansible_distribution_version | version_compare('7.4', '>=')
+    - ansible_distribution == "RedHat"
+
+- block:
+    - name: create the docker-storage-setup config file
+      template:
+        src: "{{ role_path }}/templates/docker-storage-setup-dm.j2"
+        dest: /etc/sysconfig/docker-storage-setup
+        owner: root
+        group: root
+        mode: 0644
+
+  when:
+    - ansible_distribution_version | version_compare('7.4', '<')
+    - ansible_distribution == "RedHat"
+
+- name: start docker
+  service: name=docker state=started enabled=true

roles/docker-storage-setup/templates/docker-storage-setup.j2 → roles/docker-storage-setup/templates/docker-storage-setup-dm.j2


+ 6 - 0
roles/docker-storage-setup/templates/docker-storage-setup-overlayfs.j2

@@ -0,0 +1,6 @@
+DEVS="{{ docker_dev }}"
+VG="{{ docker_vg }}"
+DATA_SIZE="{{ docker_data_size }}"
+STORAGE_DRIVER=overlay2
+CONTAINER_ROOT_LV_NAME="{{ container_root_lv_name }}"
+CONTAINER_ROOT_LV_MOUNT_PATH="{{ container_root_lv_mount_path }}"