VOL-404 This update addresses the issue reported in the Jira. The file
was no longer required as it was part of an older attempt to solve a
different problem. There are also changes to remove the consul barrier
file because it adds latency to a VM based deployment that affets
stability.
Change-Id: I9fc9a0cb3a3c4dec3b6f399e23a16b51ea7bb0d2
diff --git a/install/ansible/roles/cluster-host/tasks/main.yml b/install/ansible/roles/cluster-host/tasks/main.yml
index 834d34a..7872fa6 100644
--- a/install/ansible/roles/cluster-host/tasks/main.yml
+++ b/install/ansible/roles/cluster-host/tasks/main.yml
@@ -132,19 +132,19 @@
tags: [cluster_host]
- name: Logging barrier file is created
- command: "dd if=/dev/zero of={{ barrier_fs_dir }}/.logger-barrier-file cbs=100M bs=1G count={{ logger_volume_size }}"
+ command: "fallocate -l {{ logger_volume_size }}G {{ barrier_fs_dir }}/.logger-barrier-file"
when: target == "cluster"
tags: [cluster_host]
- name: Registry barrier file is created
- command: "dd if=/dev/zero of={{ barrier_fs_dir }}/.registry-barrier-file cbs=100M bs=1G count={{ registry_volume_size }}"
+ command: "fallocate -l {{ registry_volume_size }}G {{ barrier_fs_dir }}/.registry-barrier-file"
when: target == "cluster"
tags: [cluster_host]
-- name: Consul barrier file is created
- command: "dd if=/dev/zero of={{ barrier_fs_dir }}/.consul-barrier-file cbs=100M bs=1G count={{ consul_volume_size }}"
- when: target == "cluster"
- tags: [cluster_host]
+#- name: Consul barrier file is created
+# command: "fallocate -l {{ consul_volume_size }}G {{ barrier_fs_dir }}/.consul-barrier-file"
+# when: target == "cluster"
+# tags: [cluster_host]
- name: The logging barrier file is set up as a loop device
command: "losetup /dev/loop0 {{ barrier_fs_dir }}/.logger-barrier-file"
@@ -156,10 +156,10 @@
when: target == "cluster"
tags: [cluster_host]
-- name: The consul barrier file is set up as a loop device
- command: "losetup /dev/loop2 {{ barrier_fs_dir }}/.consul-barrier-file"
- when: target == "cluster"
- tags: [cluster_host]
+#- name: The consul barrier file is set up as a loop device
+# command: "losetup /dev/loop2 {{ barrier_fs_dir }}/.consul-barrier-file"
+# when: target == "cluster"
+# tags: [cluster_host]
- name: The xfs filesystem is created on the replicated barrier file systems
filesystem:
@@ -172,12 +172,12 @@
when: target == "cluster"
tags: [cluster_host]
-- name: The ext4 filesystem is created on the consul barrier volume
- filesystem:
- fstype: ext4
- dev: /dev/loop2
- when: target == "cluster"
- tags: [cluster_host]
+#- name: The ext4 filesystem is created on the consul barrier volume
+# filesystem:
+# fstype: ext4
+# dev: /dev/loop2
+# when: target == "cluster"
+# tags: [cluster_host]
- name: The loop devices that are no longer needed are removed
command: "losetup -D"
@@ -193,7 +193,7 @@
with_items:
- ".registry-barrier-file"
- ".logger-barrier-file"
- - ".consul-barrier-file"
+# - ".consul-barrier-file"
when: target == "cluster"
tags: [cluster_host]
@@ -271,15 +271,15 @@
when: target == "cluster"
tags: [cluster_host]
-- name: The consul data filesystem is mounted on boot
- mount:
- path: "{{ target_voltha_dir }}/consul/data"
- src: "{{ barrier_fs_dir }}/.consul-barrier-file"
- fstype: ext4
- opts: loop
- state: mounted
- when: target == "cluster"
- tags: [cluster_host]
+#- name: The consul data filesystem is mounted on boot
+# mount:
+# path: "{{ target_voltha_dir }}/consul/data"
+# src: "{{ barrier_fs_dir }}/.consul-barrier-file"
+# fstype: ext4
+# opts: loop
+# state: mounted
+# when: target == "cluster"
+# tags: [cluster_host]
- name: The glusterfs service is started
service:
diff --git a/install/ansible/roles/installer/tasks/main.yml b/install/ansible/roles/installer/tasks/main.yml
index 5db778b..0b1666e 100644
--- a/install/ansible/roles/installer/tasks/main.yml
+++ b/install/ansible/roles/installer/tasks/main.yml
@@ -27,7 +27,6 @@
- install/get-logs.sh
- install/get-host-logs.sh
- install/ansible
- - install/losetup.conf
- compose
- consul_config/basic.json
tags: [installer]