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

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

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/CHANGELOG-0.3.md b/CHANGELOG-0.3.md
@@ -23,4 +23,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/CHANGELOG-0.4.md b/CHANGELOG-0.4.md
@@ -1,5 +1,11 @@
 # Changelog 0.4
 
+## [0.4.5] 2020-XX-XX
+
+### Fixed
+
+- [#1350](https://github.com/epiphany-platform/epiphany/issues/1350) - Cannot deploy a non-k8s cluster with load\_balancer vm
+
 ## [0.4.4] 2020-04-16
 
 ### Fixed

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
@@ -19,7 +19,7 @@ global
 
    ssl-dh-param-file /etc/haproxy/dhparam
 
- 
+
 defaults
    log global
    mode http
@@ -73,7 +73,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
@@ -19,7 +19,7 @@ global
 
    ssl-dh-param-file /etc/opt/rh/rh-haproxy18/haproxy/dhparam
 
- 
+
 defaults
    log global
    mode http
@@ -74,7 +74,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 %}