v0.3 Hotfix: adding condition preventing load_balancer code from cras…

…hing (#1362) (#1369) * load_balancer: adding condition preventing ansible code from crashing * updating changelog for v0.3
hitachienergy · Jun 17, 2020 · 3d4fc8a · 3d4fc8a
1 parent 4ebb96c
commit 3d4fc8a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/CHANGELOG-0.3.md b/CHANGELOG-0.3.md
@@ -1,5 +1,11 @@
 # Changelog 0.3
 
+## [0.3.2] 2020-XX-XX
+
+### Fixed
+
+- [#1350](https://github.com/epiphany-platform/epiphany/issues/1350) - Cannot deploy a non-k8s cluster with load\_balancer vm
+
 ## [0.3.1] 2020-04-20
 
 ### Fixed
@@ -40,4 +46,4 @@
 ### Known issues
 
 - Deployment/Application role fails because Kubernetes cluster is not ready after reboot. More info [here](https://github.com/epiphany-platform/epiphany/issues/407)
-- Node_exporter ports are not present in defaults resulting in Prometheus not beeing able to scrape data with minimal cluster data.yaml. More info [here](https://github.com/epiphany-platform/epiphany/issues/410)
+- Node_exporter ports are not present in defaults resulting in Prometheus not beeing able to scrape data with minimal cluster data.yaml. More info [here](https://github.com/epiphany-platform/epiphany/issues/410)
diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/haproxy/templates/haproxy_Debian.cfg.j2 b/core/src/epicli/data/common/ansible/playbooks/roles/haproxy/templates/haproxy_Debian.cfg.j2
@@ -17,7 +17,7 @@ global
    ssl-default-server-ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384
    ssl-default-server-options no-sslv3 no-tlsv10 no-tlsv11 no-tls-tickets
 
- 
+
 defaults
    log global
    mode http
@@ -71,7 +71,7 @@ backend {{ back.name }}
   option tcp-check
   mode tcp
   {%- endif %}
-  {%- if back.server_groups is defined %}
+  {%- if back.server_groups is defined and back.server_groups is subset(groups) %}
   {%- for server_group in back.server_groups %}
   {%- for server in groups[server_group] %}
   {%- if back.https is defined and back.https == True %}

diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/haproxy/templates/haproxy_RedHat.cfg.j2 b/core/src/epicli/data/common/ansible/playbooks/roles/haproxy/templates/haproxy_RedHat.cfg.j2
@@ -17,7 +17,7 @@ global
    ssl-default-server-ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384
    ssl-default-server-options no-sslv3 no-tlsv10 no-tlsv11 no-tls-tickets
 
- 
+
 defaults
    log global
    mode http
@@ -72,7 +72,7 @@ backend {{ back.name }}
   option tcp-check
   mode tcp
   {%- endif %}
-  {%- if back.server_groups is defined %}
+  {%- if back.server_groups is defined and back.server_groups is subset(groups) %}
   {%- for server_group in back.server_groups %}
   {%- for server in groups[server_group] %}
   {%- if back.https is defined and back.https == True %}