Browse Source
Fix deployment without openstack cacert (#7723)
* fix group name
* fix external-openstack-cloud-config secret
* don't add ca.cert in the secret if not defined
pull/7727/head
Id2ndR
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
5 additions and
3 deletions
-
roles/kubernetes-apps/external_cloud_controller/openstack/tasks/main.yml
-
roles/kubernetes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-config-secret.yml.j2
|
|
@ -7,7 +7,7 @@ |
|
|
src: "{{ external_openstack_cacert }}" |
|
|
src: "{{ external_openstack_cacert }}" |
|
|
register: external_openstack_cacert_b64 |
|
|
register: external_openstack_cacert_b64 |
|
|
when: |
|
|
when: |
|
|
- inventory_hostname == groups['k8s_control_plane'][0] |
|
|
|
|
|
|
|
|
- inventory_hostname == groups['kube_control_plane'][0] |
|
|
- external_openstack_cacert is defined |
|
|
- external_openstack_cacert is defined |
|
|
- external_openstack_cacert | length > 0 |
|
|
- external_openstack_cacert | length > 0 |
|
|
tags: external-openstack |
|
|
tags: external-openstack |
|
|
|
|
|
@ -7,5 +7,7 @@ metadata: |
|
|
name: external-openstack-cloud-config |
|
|
name: external-openstack-cloud-config |
|
|
namespace: kube-system |
|
|
namespace: kube-system |
|
|
data: |
|
|
data: |
|
|
cloud.conf: {{ external_openstack_cloud_config_secret.content }} |
|
|
|
|
|
ca.cert: {{ external_openstack_cacert_b64.content | default("") }} |
|
|
|
|
|
|
|
|
cloud.conf: {{ external_openstack_cloud_config_secret }} |
|
|
|
|
|
{% if external_openstack_cacert_b64.content is defined %} |
|
|
|
|
|
ca.cert: {{ external_openstack_cacert_b64.content }} |
|
|
|
|
|
{% endif %} |
