default ingress and update hostname

oracle-devrel · Sep 21, 2024 · a505a5b · a505a5b
1 parent 0f4f8c2
commit a505a5b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 134 deletions.
diff --git a/ocne2/default_vars.yml b/ocne2/default_vars.yml
@@ -1,6 +1,6 @@
 compute_instances:
   1:
-    instance_name: "ol-node-01"
+    instance_name: "ocne"
     type: "server"
 os: "Oracle Linux"
 os_version: "8"

diff --git a/ocne2/templates/ingress_security_rules.j2 b/ocne2/templates/ingress_security_rules.j2
@@ -11,78 +11,4 @@ instance_ingress_security_rules:
     tcp_options:
       destination_port_range:
         max: 22
-        min: 22
-{% if use_haproxy %}
-  - source: "10.0.0.0/24"
-    protocol: 6
-    tcp_options:
-      destination_port_range:
-        max: 8080
-        min: 8080
-{% endif %}
-{% if use_nginx %}
-  - source: "0.0.0.0/0"
-    protocol: 6
-    tcp_options:
-      destination_port_range:
-        max: 80
-        min: 80
-  - source: "0.0.0.0/0"
-    protocol: 6
-    tcp_options:
-      destination_port_range:
-        max: 443
-        min: 443
-  - source: "0.0.0.0/0"
-    protocol: 6
-    tcp_options:
-      destination_port_range:
-        max: 8080
-        min: 8080
-{% endif %}
-{% if use_nfs %}
-  - source: "10.0.0.0/24"
-    protocol: 6
-    tcp_options:
-      destination_port_range:
-        max: 2049
-        min: 2049
-  - source: "10.0.0.0/24"
-    protocol: 17
-    udp_options:
-      destination_port_range:
-        max: 2049
-        min: 2049
-{% endif %}
-{% if use_quay_ha %}
-  - source: "10.0.0.0/24"
-    protocol: 6
-    tcp_options:
-      destination_port_range:
-        max: 2049
-        min: 2049
-  - source: "10.0.0.0/24"
-    protocol: 17
-    udp_options:
-      destination_port_range:
-        max: 2049
-        min: 2049
-  - source: "10.0.0.0/24"
-    protocol: 6
-    tcp_options:
-      destination_port_range:
-        max: 8080
-        min: 8080
-  - source: "10.0.0.0/24"
-    protocol: 6
-    tcp_options:
-      destination_port_range:
-        max: 5432
-        min: 5432
-  - source: "10.0.0.0/24"
-    protocol: 6
-    tcp_options:
-      destination_port_range:
-        max: 6379
-        min: 6379    
-{% endif %}
+        min: 22
diff --git a/ocne2/templates/vm_template.j2 b/ocne2/templates/vm_template.j2