add iscsi block vol for ocfs2 and ingress rules

Author: bgraef

ol/block.yml

@@ -29,7 +29,7 @@
     - name: Attach the block volume
       oracle.oci.oci_compute_volume_attachment:
         instance_id: "{{ instance_id }}"
-        type: paravirtualized
+        type: "{{ volume_type }}"
         volume_id: "{{ volume_id }}"
         compartment_id: "{{ my_compartment_id }}"
         device: "/dev/oracleoci/oraclevd{{ block_devices[ansible_loop.index0] }}"

ol/build.yml

@@ -96,6 +96,42 @@
       - h
       - i
 
+- name: Add block volume for ocfs2
+  when:
+    - "{{ item.value.add_ocfs_block_storage | default('false') | bool }}"
+  block:
+    - name: Create block volume
+      oracle.oci.oci_blockstorage_volume:
+        compartment_id: "{{ my_compartment_id }}"
+        availability_domain: "{{ my_availability_domain }}"
+        display_name: "bv-ocfs2"
+        size_in_gbs: "{{ block_volume_size_in_gbs }}"
+        key_by: [compartment_id, display_name]
+      register: result
+      retries: 10
+      delay: 30
+      until: result is not failed
+
+    - name: Set the block volume id
+      ansible.builtin.set_fact:
+        volume_id: "{{ result.volume.id }}"
+
+    - name: Attach the block volume
+      oracle.oci.oci_compute_volume_attachment:
+        instance_id: "{{ instance_id }}"
+        type: "{{ volume_type }}"
+        volume_id: "{{ volume_id }}"
+        compartment_id: "{{ my_compartment_id }}"
+        device: "/dev/oracleoci/oraclevdo"
+        display_name: "blockvolume-vdo"
+        is_read_only: false
+        is_shareable: true
+        key_by: [compartment_id, display_name]
+      retries: 10
+      delay: 30
+      until: result is not failed
+
+
 - name: Print the public and private ip of the newly created instance
   ansible.builtin.debug:
     msg:

ol/default_vars.yml

@@ -3,6 +3,7 @@ compute_instances:
     instance_name: "ol-node-01"
     type: "server"
     boot_volume_size_in_gbs: 50
+    add_ocfs_block_storage: false
 os: "Oracle Linux"
 os_version: "8"
 instance_shape: "VM.Standard.E4.Flex"
@@ -17,6 +18,7 @@ debug_enabled: false
 add_block_storage: false
 block_volume_size_in_gbs: 50
 block_count: 1
+volume_type: "paravirtualized"
 
 use_vnc: false
 vnc_port: "1"
@@ -47,6 +49,7 @@ use_nginx: false
 use_nfs: false
 use_quay_ha: false
 use_pcp: false
+use_ocfs2: false
 
 use_vbox: false
 virtualbox_version: "7.1"

ol/templates/ingress_security_rules.j2

@@ -93,4 +93,18 @@ instance_ingress_security_rules:
       destination_port_range:
         max: 44321
         min: 44321
+{% endif %}
+{% if use_ocfs2 %}
+  - source: "10.0.0.0/24"
+    protocol: 6
+    tcp_options:
+      destination_port_range:
+        max: 7777
+        min: 7777
+  - source: "10.0.0.0/24"
+    protocol: 17
+    udp_options:
+      destination_port_range:
+        max: 7777
+        min: 7777
 {% endif %}