summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSachin Prabhu <sprabhu@redhat.com>2020-05-29 16:22:42 +0100
committerAnoop C S <anoopcs@cryptolab.net>2020-06-17 17:01:24 +0530
commitccbb4faa8111f2b971b1b2908f4e32d95cfade86 (patch)
treec484feac4220c8d367e559b454f4092bc3da5e00
parent174c5c8f629edd475c3442801bb3c56b1cc8b3c7 (diff)
downloadsamba-integration-ccbb4faa8111f2b971b1b2908f4e32d95cfade86.tar.gz
samba-integration-ccbb4faa8111f2b971b1b2908f4e32d95cfade86.tar.xz
samba-integration-ccbb4faa8111f2b971b1b2908f4e32d95cfade86.zip
Remove auto generated mount points
Various combinations of test mount points were generated for the clients with the expectation that they will be useful when testing. Since then, we have created a test runner to run tests. These mounts are better handled from the test runner instead. Signed-off-by: Sachin Prabhu <sprabhu@redhat.com>
-rw-r--r--vagrant/ansible/roles/client.prep/tasks/main.yml28
-rw-r--r--vagrant/ansible/roles/client.prep/tasks/mkdir_usermounts.yml18
2 files changed, 0 insertions, 46 deletions
diff --git a/vagrant/ansible/roles/client.prep/tasks/main.yml b/vagrant/ansible/roles/client.prep/tasks/main.yml
index 104a3ec..e41e915 100644
--- a/vagrant/ansible/roles/client.prep/tasks/main.yml
+++ b/vagrant/ansible/roles/client.prep/tasks/main.yml
@@ -15,12 +15,6 @@
- debug:
msg: "{{ ctdb_network_public_interfaces }}"
-- name: Set variables to be used later
- set_fact:
- num_hosts: "{{ ctdb_network_public_interfaces | length }}"
- num_users: "{{ samba_users | length }}"
- testhost0: "{{ ctdb_network_public_interfaces[0] }}"
-
- name: Make directory to contain share mount points
file:
path: /test-mnt
@@ -36,28 +30,6 @@
fstype: glusterfs
state: present
-- name: Add test hosts to /etc/hosts
- lineinfile:
- path: /etc/hosts
- line: "{{ ctdb_network_public_interfaces[item|int] }} testhost{{ item }}"
- regexp: "^{{ ctdb_network_public_interfaces[item|int] }} "
- insertafter: EOF
- with_sequence: start=0 end={{ num_hosts |int -1 }}
-
-- name: Create folders for each directory
- file:
- path: "/test-mnt/testhost{{ item }}"
- state: directory
- owner: root
- group: root
- mode: 0755
- with_sequence: start=0 end={{ num_hosts |int -1 }}
-
-- include_tasks: "mkdir_usermounts.yml"
- with_sequence: start=0 end={{ num_hosts |int -1 }}
- loop_control:
- loop_var: testhost_num
-
- name: Create a README file
template:
src: README.j2
diff --git a/vagrant/ansible/roles/client.prep/tasks/mkdir_usermounts.yml b/vagrant/ansible/roles/client.prep/tasks/mkdir_usermounts.yml
deleted file mode 100644
index 58d2b2f..0000000
--- a/vagrant/ansible/roles/client.prep/tasks/mkdir_usermounts.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: Create user mount directories
- file:
- path: "/test-mnt/testhost{{ testhost_num }}/{{item.username}}"
- state: directory
- owner: root
- group: root
- mode: 0755
- with_items: "{{ samba_users }}"
-
-- name: Add user mounts
- mount:
- path: "/test-mnt/testhost{{ testhost_num }}/{{item.username}}"
- src: "//testhost{{ testhost_num }}/gluster-vol"
- fstype: cifs
- opts: "username={{ item.username }},password={{ item.password }},vers=2.1"
- state: present
- with_items: "{{ samba_users }}"