Browse Source

cloud-provider-openstack: upgrade 1.22.0 to 1.23.4 (#9332)

pull/9331/head
Federico Cucinella 2 years ago
committed by GitHub
parent
commit
e486151aea
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 1 deletions
  1. 2
      roles/kubernetes-apps/external_cloud_controller/openstack/defaults/main.yml
  2. 6
      roles/kubernetes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-config.j2
  3. 2
      roles/kubespray-defaults/defaults/main.yaml

2
roles/kubernetes-apps/external_cloud_controller/openstack/defaults/main.yml

@ -21,4 +21,4 @@ external_openstack_cacert: "{{ lookup('env','OS_CACERT') }}"
## arg1: "value1" ## arg1: "value1"
## arg2: "value2" ## arg2: "value2"
external_openstack_cloud_controller_extra_args: {} external_openstack_cloud_controller_extra_args: {}
external_openstack_cloud_controller_image_tag: "v1.22.0"
external_openstack_cloud_controller_image_tag: "v1.23.4"

6
roles/kubernetes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-config.j2

@ -65,6 +65,12 @@ use-octavia=true
{% if external_openstack_enable_ingress_hostname is defined %} {% if external_openstack_enable_ingress_hostname is defined %}
enable-ingress-hostname={{ external_openstack_enable_ingress_hostname | bool }} enable-ingress-hostname={{ external_openstack_enable_ingress_hostname | bool }}
{% endif %} {% endif %}
{% if external_openstack_ingress_hostname_suffix is defined %}
ingress-hostname-suffix={{ external_openstack_ingress_hostname_suffix | string | lower }}
{% endif %}
{% if external_openstack_max_shared_lb is defined %}
max-shared-lb={{ external_openstack_max_shared_lb }}
{% endif %}
[Networking] [Networking]
ipv6-support-disabled={{ external_openstack_network_ipv6_disabled | string | lower }} ipv6-support-disabled={{ external_openstack_network_ipv6_disabled | string | lower }}

2
roles/kubespray-defaults/defaults/main.yaml

@ -440,6 +440,8 @@ openstack_cacert: "{{ lookup('env','OS_CACERT') }}"
# Default values for the external OpenStack Cloud Controller # Default values for the external OpenStack Cloud Controller
external_openstack_enable_ingress_hostname: false external_openstack_enable_ingress_hostname: false
external_openstack_ingress_hostname_suffix: "nip.io"
external_openstack_max_shared_lb: 2
external_openstack_lbaas_create_monitor: false external_openstack_lbaas_create_monitor: false
external_openstack_lbaas_monitor_delay: "1m" external_openstack_lbaas_monitor_delay: "1m"
external_openstack_lbaas_monitor_timeout: "30s" external_openstack_lbaas_monitor_timeout: "30s"

Loading…
Cancel
Save