From 688cc7712c6b49a782c38ac089404c6e7d94b361 Mon Sep 17 00:00:00 2001 From: William Graef Date: Thu, 5 Sep 2024 22:05:04 -0400 Subject: [PATCH 1/3] fix helloworld sample and ingress for quay ha --- labs/olam-hello-world.yaml | 8 +++---- ol/templates/ingress_security_rules.j2 | 32 ++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/labs/olam-hello-world.yaml b/labs/olam-hello-world.yaml index e722e16..8b25fcf 100644 --- a/labs/olam-hello-world.yaml +++ b/labs/olam-hello-world.yaml @@ -9,7 +9,7 @@ gather_facts: false tasks: - - - name: Print welcome message - ansible.builtin.debug: - msg: "Hello! Welcome to Oracle Linux Automation Manager." \ No newline at end of file + + - name: Print welcome message + ansible.builtin.debug: + msg: "Hello! Welcome to Oracle Linux Automation Manager." diff --git a/ol/templates/ingress_security_rules.j2 b/ol/templates/ingress_security_rules.j2 index de6a62c..06d7709 100644 --- a/ol/templates/ingress_security_rules.j2 +++ b/ol/templates/ingress_security_rules.j2 @@ -53,4 +53,36 @@ instance_ingress_security_rules: 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 %} \ No newline at end of file From 8d675c3973a84b7792e2812390879dee967e1f57 Mon Sep 17 00:00:00 2001 From: William Graef Date: Thu, 5 Sep 2024 22:18:13 -0400 Subject: [PATCH 2/3] add use_quay_ha ingress var to defaults --- ol/default_vars.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ol/default_vars.yml b/ol/default_vars.yml index 2a72a3b..c4f8e8f 100644 --- a/ol/default_vars.yml +++ b/ol/default_vars.yml @@ -43,4 +43,5 @@ passwordless_ssh: false use_podman: false use_haproxy: false use_nginx: false -use_nfs: false \ No newline at end of file +use_nfs: false +use_quay_ha: false \ No newline at end of file From f3f3891c09fd061954f2df8016e901053d075c72 Mon Sep 17 00:00:00 2001 From: William Graef Date: Thu, 5 Sep 2024 22:32:02 -0400 Subject: [PATCH 3/3] fix typo in ingress yml --- ol/templates/ingress_security_rules.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ol/templates/ingress_security_rules.j2 b/ol/templates/ingress_security_rules.j2 index 06d7709..c4f607e 100644 --- a/ol/templates/ingress_security_rules.j2 +++ b/ol/templates/ingress_security_rules.j2 @@ -67,19 +67,19 @@ instance_ingress_security_rules: destination_port_range: max: 2049 min: 2049 -- source: "10.0.0.0/24" + - source: "10.0.0.0/24" protocol: 6 tcp_options: destination_port_range: max: 8080 min: 8080 -- source: "10.0.0.0/24" + - source: "10.0.0.0/24" protocol: 6 tcp_options: destination_port_range: max: 5432 min: 5432 -- source: "10.0.0.0/24" + - source: "10.0.0.0/24" protocol: 6 tcp_options: destination_port_range: