summaryrefslogtreecommitdiffstats
path: root/vagrant
diff options
context:
space:
mode:
authorSachin Prabhu <sprabhu@redhat.com>2020-08-19 14:20:17 +0100
committerspuiuk <sachin.prabhu@gmail.com>2020-08-24 12:26:57 +0100
commit82869a33fc51278082f71d6a2efadbd5cc2a3f76 (patch)
tree8b191176be35a2f318e74ba27b4bd3ce99925609 /vagrant
parentbc8bd8045dcb9e6a2df8f8ac327739934f190e2c (diff)
downloadsamba-integration-82869a33fc51278082f71d6a2efadbd5cc2a3f76.tar.gz
samba-integration-82869a33fc51278082f71d6a2efadbd5cc2a3f76.tar.xz
samba-integration-82869a33fc51278082f71d6a2efadbd5cc2a3f76.zip
Add new dispersed volumes
This allows us to run our tests on dispersed volumes. Signed-off-by: Sachin Prabhu <sprabhu@redhat.com>
Diffstat (limited to 'vagrant')
-rw-r--r--vagrant/ansible/cluster-vars.yml11
-rw-r--r--vagrant/ansible/roles/glusterfs.setup/tasks/main.yml8
-rw-r--r--vagrant/ansible/roles/glusterfs.setup/tasks/new_volume.yml11
3 files changed, 27 insertions, 3 deletions
diff --git a/vagrant/ansible/cluster-vars.yml b/vagrant/ansible/cluster-vars.yml
index 00281f7..aa6e377 100644
--- a/vagrant/ansible/cluster-vars.yml
+++ b/vagrant/ansible/cluster-vars.yml
@@ -23,9 +23,9 @@ gluster_infra_mount_devices:
- { path: '/bricks/brick-repl-0', vgname: 'vg_vdb', lvname: 'vg_vdb_a' }
- { path: '/bricks/brick-repl-1', vgname: 'vg_vdc', lvname: 'vg_vdc_a' }
- { path: '/bricks/brick-repl-2', vgname: 'vg_vdd', lvname: 'vg_vdd_a' }
- - { path: '/bricks/brick3', vgname: 'vg_vdb', lvname: 'vg_vdb_b' }
- - { path: '/bricks/brick4', vgname: 'vg_vdc', lvname: 'vg_vdc_b' }
- - { path: '/bricks/brick5', vgname: 'vg_vdd', lvname: 'vg_vdd_b' }
+ - { path: '/bricks/brick-disp-0', vgname: 'vg_vdb', lvname: 'vg_vdb_b' }
+ - { path: '/bricks/brick-disp-1', vgname: 'vg_vdc', lvname: 'vg_vdc_b' }
+ - { path: '/bricks/brick-disp-2', vgname: 'vg_vdd', lvname: 'vg_vdd_b' }
- { path: "{{ ctdb_brick_location }}", vgname: 'vg_vdb', lvname: 'ctdblv' }
gluster_infra_fw_ports:
@@ -54,6 +54,10 @@ replicate_cluster_volume: "vol-replicate"
replicate_cluster_replica_count: "{{ cluster_hosts|length }}"
replicate_cluster_bricks: '/bricks/brick-repl-0/vol,/bricks/brick-repl-1/vol,/bricks/brick-repl-2/vol'
+disperse_cluster_volume: "vol-disperse"
+disperse_cluster_disperse_count: 3
+disperse_cluster_bricks: '/bricks/brick-disp-0/vol,/bricks/brick-disp-1/vol,/bricks/brick-disp-2/vol'
+
#Autogenerate these values containing ip addresses
ctdb_network_private_interfaces:
- "192.168.122.100"
@@ -73,3 +77,4 @@ samba_users:
samba_shares:
- { cluster_volume: "vol-replicate", share_name: "gluster-vol-replicate" }
+ - { cluster_volume: "vol-disperse", share_name: "gluster-vol-disperse" }
diff --git a/vagrant/ansible/roles/glusterfs.setup/tasks/main.yml b/vagrant/ansible/roles/glusterfs.setup/tasks/main.yml
index 2210fda..c710cae 100644
--- a/vagrant/ansible/roles/glusterfs.setup/tasks/main.yml
+++ b/vagrant/ansible/roles/glusterfs.setup/tasks/main.yml
@@ -14,3 +14,11 @@
cluster_bricks: "{{ replicate_cluster_bricks }}"
cluster_replica_count: "{{ replicate_cluster_replica_count }}"
cluster_type: "replicate"
+
+- include_tasks:
+ file: "new_volume.yml"
+ vars:
+ cluster_volume: "{{ disperse_cluster_volume }}"
+ cluster_bricks: "{{ disperse_cluster_bricks }}"
+ cluster_disperse_count: "{{ disperse_cluster_disperse_count }}"
+ cluster_type: "disperse"
diff --git a/vagrant/ansible/roles/glusterfs.setup/tasks/new_volume.yml b/vagrant/ansible/roles/glusterfs.setup/tasks/new_volume.yml
index ec10897..736f1b7 100644
--- a/vagrant/ansible/roles/glusterfs.setup/tasks/new_volume.yml
+++ b/vagrant/ansible/roles/glusterfs.setup/tasks/new_volume.yml
@@ -8,6 +8,17 @@
run_once: yes
when: cluster_type == 'replicate'
+- name: Create Dispersed Volumes
+ gluster_volume:
+ state: present
+ name: "{{ cluster_volume }}"
+ bricks: "{{ cluster_bricks }}"
+ cluster: "{{ cluster_hosts }}"
+ disperses: "{{ cluster_disperse_count }}"
+ force: yes
+ run_once: yes
+ when: cluster_type == 'disperse'
+
- name: Set volume options
gluster_volume:
state: present