Merge pull request #31 from stfc/split_benchmarks

split storage benchmarks into seperate roles
stfc · Oct 4, 2024 · 50fd682 · 50fd682
2 parents b163a25 + 649d63c
commit 50fd682
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 4 deletions.
diff --git a/AnsiblePlaybooks/meerkat/deploy.tf b/AnsiblePlaybooks/meerkat/deploy.tf
@@ -94,7 +94,8 @@ resource "null_resource" "ansible_playbook" {
   depends_on = [openstack_compute_instance_v2.Instance, openstack_sharedfilesystem_share_v2.share, openstack_sharedfilesystem_share_access_v2.share_access, openstack_blockstorage_volume_v3.volumes, openstack_compute_volume_attach_v2.vol_attach]
   count = length(openstack_compute_instance_v2.Instance)
   provisioner "local-exec" {
-    command = "ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -i staging-openstack.yaml -l ${local.vm_names[count.index]} ${var.playbook_path} --extra-vars 'share_path=${openstack_sharedfilesystem_share_v2.share.export_locations[0].path} access_key=${openstack_sharedfilesystem_share_access_v2.share_access.access_key} vm_count=${count.index}'"
+    command = "ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -i staging-openstack.yaml -l ${local.vm_names[count.index]} ${var.playbook_path}"
+#    command = "ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -i staging-openstack.yaml -l ${local.vm_names[count.index]} ${var.playbook_path} --extra-vars 'share_path=${openstack_sharedfilesystem_share_v2.share.export_locations[0].path} access_key=${openstack_sharedfilesystem_share_access_v2.share_access.access_key} vm_count=${count.index}'"
   }
 }
 
diff --git a/AnsiblePlaybooks/meerkat/meerkat.yaml b/AnsiblePlaybooks/meerkat/meerkat.yaml
@@ -19,9 +19,11 @@
     - role: setup_openstack
     - role: update_machine
     - role: setup_storage_benchmark
+    - role: run_local_storage_benchmark
     - role: attach_volume
+    - role: run_volume_storage_benchmark
     - role: attach_manila
-    - role: run_storage_benchmark
+    - role: run_manila_storage_benchmark
 
 
 - hosts: cpu

diff --git a/AnsiblePlaybooks/meerkat/roles/attach_manila/tasks/main.yaml b/AnsiblePlaybooks/meerkat/roles/attach_manila/tasks/main.yaml
@@ -10,6 +10,6 @@
 - name: change manila folder owner
   ansible.builtin.file:
     path: /mnt/manila{{ vm_count }}
-    owner: "{{ user  }}"
+    owner: "{{ user }}"
     mode: '0664'
   become: true
diff --git a/AnsiblePlaybooks/meerkat/roles/run_local_storage_benchmark/tasks/main.yaml b/AnsiblePlaybooks/meerkat/roles/run_local_storage_benchmark/tasks/main.yaml
@@ -0,0 +1,2 @@
+- name: Run local storage benchmark
+  shell: "./benchmark.sh -p /home/{{ user }} -s local"
diff --git a/AnsiblePlaybooks/meerkat/roles/run_manila_storage_benchmark/tasks/main.yaml b/AnsiblePlaybooks/meerkat/roles/run_manila_storage_benchmark/tasks/main.yaml
@@ -0,0 +1,2 @@
+- name: Run manila share benchmark
+  shell: ./benchmark.sh -p /mnt/manila_{{ share_id }} -s manila
diff --git a/AnsiblePlaybooks/meerkat/roles/run_volume_storage_benchmark/tasks/main.yaml b/AnsiblePlaybooks/meerkat/roles/run_volume_storage_benchmark/tasks/main.yaml
@@ -0,0 +1,2 @@
+- name: Run volume storage benchmark
+  shell: ./benchmark.sh -p /mnt/volume -s volume
diff --git a/AnsiblePlaybooks/meerkat/variables.tf b/AnsiblePlaybooks/meerkat/variables.tf
@@ -30,7 +30,7 @@ variable "image_name" {
 
 variable "keypair_name" {
     description = "The keypair to be used"
-    default  = 
+    default  = "<ssh-key>"
 }
 
 variable "network_name" {