Skip to content
Snippets Groups Projects
Commit a330b281 authored by Jan Wozniak's avatar Jan Wozniak
Browse files

Check `openstack_cacert` for empty string

parent a8a62afd
No related branches found
No related tags found
No related merge requests found
...@@ -118,7 +118,7 @@ controllerManagerExtraArgs: ...@@ -118,7 +118,7 @@ controllerManagerExtraArgs:
{% for key in kube_kubeadm_controller_extra_args %} {% for key in kube_kubeadm_controller_extra_args %}
{{ key }}: "{{ kube_kubeadm_controller_extra_args[key] }}" {{ key }}: "{{ kube_kubeadm_controller_extra_args[key] }}"
{% endfor %} {% endfor %}
{% if cloud_provider is defined and cloud_provider in ["openstack"] and openstack_cacert is defined %} {% if cloud_provider is defined and cloud_provider in ["openstack"] and openstack_cacert is defined and openstack_cacert != "" %}
controllerManagerExtraVolumes: controllerManagerExtraVolumes:
- name: openstackcacert - name: openstackcacert
hostPath: "{{ kube_config_dir }}/openstack-cacert.pem" hostPath: "{{ kube_config_dir }}/openstack-cacert.pem"
......
...@@ -117,7 +117,7 @@ controllerManagerExtraArgs: ...@@ -117,7 +117,7 @@ controllerManagerExtraArgs:
{% for key in kube_kubeadm_controller_extra_args %} {% for key in kube_kubeadm_controller_extra_args %}
{{ key }}: "{{ kube_kubeadm_controller_extra_args[key] }}" {{ key }}: "{{ kube_kubeadm_controller_extra_args[key] }}"
{% endfor %} {% endfor %}
{% if cloud_provider is defined and cloud_provider in ["openstack"] and openstack_cacert is defined %} {% if cloud_provider is defined and cloud_provider in ["openstack"] and openstack_cacert is defined and openstack_cacert != "" %}
controllerManagerExtraVolumes: controllerManagerExtraVolumes:
- name: openstackcacert - name: openstackcacert
hostPath: "{{ kube_config_dir }}/openstack-cacert.pem" hostPath: "{{ kube_config_dir }}/openstack-cacert.pem"
......
...@@ -97,7 +97,7 @@ spec: ...@@ -97,7 +97,7 @@ spec:
name: cloudconfig name: cloudconfig
readOnly: true readOnly: true
{% endif %} {% endif %}
{% if cloud_provider is defined and cloud_provider in ["openstack"] and openstack_cacert is defined %} {% if cloud_provider is defined and cloud_provider in ["openstack"] and openstack_cacert is defined and openstack_cacert != "" %}
- mountPath: "{{ kube_config_dir }}/openstack-cacert.pem" - mountPath: "{{ kube_config_dir }}/openstack-cacert.pem"
name: openstackcacert name: openstackcacert
readOnly: true readOnly: true
...@@ -122,7 +122,7 @@ spec: ...@@ -122,7 +122,7 @@ spec:
path: "{{ kube_config_dir }}/cloud_config" path: "{{ kube_config_dir }}/cloud_config"
name: cloudconfig name: cloudconfig
{% endif %} {% endif %}
{% if cloud_provider is defined and cloud_provider in ["openstack"] and openstack_cacert is defined %} {% if cloud_provider is defined and cloud_provider in ["openstack"] and openstack_cacert is defined and openstack_cacert != "" %}
- hostPath: - hostPath:
path: "{{ kube_config_dir }}/openstack-cacert.pem" path: "{{ kube_config_dir }}/openstack-cacert.pem"
name: openstackcacert name: openstackcacert
......
...@@ -177,6 +177,7 @@ ...@@ -177,6 +177,7 @@
- cloud_provider is defined - cloud_provider is defined
- cloud_provider == 'openstack' - cloud_provider == 'openstack'
- openstack_cacert is defined - openstack_cacert is defined
- openstack_cacert != ""
tags: tags:
- cloud-provider - cloud-provider
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment