From c16efc9ab85f1d74cd6ad374e6e28de98f975c95 Mon Sep 17 00:00:00 2001
From: Florian Ruynat <16313165+floryut@users.noreply.github.com>
Date: Mon, 26 Apr 2021 17:37:02 +0200
Subject: [PATCH] Fix Opensuse not working with ansible_distribution (#7551)
---
.../ambassador/templates/deploy-ambassador.yml.j2 | 6 +++---
roles/kubernetes/preinstall/tasks/0020-verify-settings.yml | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/roles/kubernetes-apps/ingress_controller/ambassador/templates/deploy-ambassador.yml.j2 b/roles/kubernetes-apps/ingress_controller/ambassador/templates/deploy-ambassador.yml.j2
index 58fa32b4e..41bdbdc64 100644
--- a/roles/kubernetes-apps/ingress_controller/ambassador/templates/deploy-ambassador.yml.j2
+++ b/roles/kubernetes-apps/ingress_controller/ambassador/templates/deploy-ambassador.yml.j2
@@ -32,13 +32,13 @@ spec:
imagePullPolicy: {{ k8s_image_pull_policy }}
env:
- name: WATCH_NAMESPACE
- {%- if ingress_ambassador_multi_namespaces %}
+{% if ingress_ambassador_multi_namespaces %}
value: ''
- {%- else %}
+{% else %}
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- {%- end %}
+{% endif %}
- name: POD_NAME
valueFrom:
fieldRef:
diff --git a/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml b/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml
index 5c041b8de..a232694e9 100644
--- a/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml
+++ b/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml
@@ -24,7 +24,7 @@
- name: Stop if unknown OS
assert:
- that: ansible_distribution in ['RedHat', 'CentOS', 'Fedora', 'Ubuntu', 'Debian', 'Flatcar Container Linux by Kinvolk', 'Suse', 'ClearLinux', 'OracleLinux', 'AlmaLinux']
+ that: ansible_distribution in ['RedHat', 'CentOS', 'Fedora', 'Ubuntu', 'Debian', 'Flatcar Container Linux by Kinvolk', 'Suse', 'openSUSE Leap', 'ClearLinux', 'OracleLinux', 'AlmaLinux']
msg: "{{ ansible_distribution }} is not a known OS"
when: not ignore_assert_errors
--
GitLab