External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-24 04:15:04 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2130 from ArchiFleKs/simplify_os_provider

Browse Source 
Simplify and update OpenStack cloud provider
This commit is contained in:
Aivars Sterns
2018-01-31 12:02:02 +02:00
committed by GitHub
parent ac4d782937 ce85bcaee7
commit c1267004ef
3 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
roles/kubernetes/preinstall/templates/openstack-cloud-config.j2
View File

@@ -15,12 +15,22 @@ domain-id ="{{ openstack_domain_id }}"
bs-version={{ openstack_blockstorage_version }}
{% endif %}
{% if openstack_lbaas_enabled and openstack_lbaas_subnet_id %}
{% if openstack_lbaas_enabled and openstack_lbaas_subnet_id is defined %}
[LoadBalancer]
subnet-id={{ openstack_lbaas_subnet_id }}
{% if openstack_lbaas_floating_network_id is defined %}
floating-network-id={{ openstack_lbaas_floating_network_id }}
{% endif %}
{% if openstack_lbaas_use_octavia is defined %}
use-octavia={{ openstack_lbaas_use_octavia }}
{% endif %}
{% if openstack_lbaas_method is defined %}
lb-method={{ openstack_lbaas_method }}
{% endif %}
{% if openstack_lbaas_provider is defined %}
lb-provider={{ openstack_lbaas_provider }}
{% endif %}
create-monitor={{ openstack_lbaas_create_monitor }}
monitor-delay={{ openstack_lbaas_monitor_delay }}
monitor-timeout={{ openstack_lbaas_monitor_timeout }}