External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-05-09 10:27:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

use external_openstack_lbaas_use_octavia for template openstack-cloud… (#7298)

Browse Source 
* use external_openstack_lbaas_use_octavia for template openstack-cloud-config

* Delete external_openstack_lbaas_use_octavia from default values. Added description and default values of variables to docs

* markdown fix

* make this simple

* set external_openstack_lbaas_use_octavia in default values

* duplicated variable in doc
This commit is contained in:
Sergey Mikhaltsov
2021-02-25 22:25:25 +03:00
committed by GitHub
parent 2ea5793782
commit a4cc416511
3 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/kubernetes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-config.j2
View File

@@ -57,7 +57,7 @@ internal-lb={{ external_openstack_lbaas_internal_lb }}
{% endif %}
{% if external_openstack_lbaas_provider is defined %}
lb-provider={{ external_openstack_lbaas_provider }}
use-octavia={{ external_openstack_lbaas_provider | lower == 'octavia' }}
use-octavia={{ external_openstack_lbaas_use_octavia }}
{% else %}
lb-provider=octavia
use-octavia=true

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

@@ -381,12 +381,12 @@ openstack_lbaas_monitor_max_retries: "3"
openstack_cacert: "{{ lookup('env','OS_CACERT') }}"
# Default values for the external OpenStack Cloud Controller
external_openstack_lbaas_use_octavia: true
external_openstack_lbaas_create_monitor: false
external_openstack_lbaas_monitor_delay: "1m"
external_openstack_lbaas_monitor_timeout: "30s"
external_openstack_lbaas_monitor_max_retries: "3"
external_openstack_network_ipv6_disabled: false
external_openstack_lbaas_use_octavia: false
external_openstack_network_internal_networks:
- ""
external_openstack_network_public_networks: