C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix Opensuse not working with ansible_distribution (#7551)

Browse source
This commit is contained in:
Florian Ruynat 2021-04-26 17:37:02 +02:00 committed by GitHub
parent 324c95d37f
commit c16efc9ab8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
roles/kubernetes-apps/ingress_controller/ambassador/templates/deploy-ambassador.yml.j2
View file

@ -32,13 +32,13 @@ spec:
imagePullPolicy: {{ k8s_image_pull_policy }} imagePullPolicy: {{ k8s_image_pull_policy }}
env: env:
- name: WATCH_NAMESPACE - name: WATCH_NAMESPACE
{%- if ingress_ambassador_multi_namespaces %} {% if ingress_ambassador_multi_namespaces %}
value: '' value: ''
{%- else %} {% else %}
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: metadata.namespace fieldPath: metadata.namespace
{%- end %} {% endif %}
- name: POD_NAME - name: POD_NAME
valueFrom: valueFrom:
fieldRef: fieldRef:

2
roles/kubernetes/preinstall/tasks/0020-verify-settings.yml
View file

@ -24,7 +24,7 @@
- name: Stop if unknown OS - name: Stop if unknown OS
assert: 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" msg: "{{ ansible_distribution }} is not a known OS"
when: not ignore_assert_errors when: not ignore_assert_errors