C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add external_openstack_lbaas_provider setting for occm (#6566)

Browse source 
* Add external_openstack_lbaas_provider setting for occm

* Integrate with existing lbaas_provider block

* Refactor lbaas_provider config template block

* Remove external_openstack_lbaas_use_octavia from sample inventory
This commit is contained in:
Marc-Antoine 2020-09-21 16:04:32 +02:00 committed by GitHub
parent e489e70031
commit 5ec2467268
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
inventory/sample/group_vars/all/openstack.yml
View file

@ -20,8 +20,8 @@
# external_openstack_lbaas_subnet_id: "Neutron subnet ID to create LBaaS VIP" # external_openstack_lbaas_subnet_id: "Neutron subnet ID to create LBaaS VIP"
# external_openstack_lbaas_floating_network_id: "Neutron network ID to get floating IP from" # external_openstack_lbaas_floating_network_id: "Neutron network ID to get floating IP from"
# external_openstack_lbaas_floating_subnet_id: "Neutron subnet ID to get floating IP from" # external_openstack_lbaas_floating_subnet_id: "Neutron subnet ID to get floating IP from"
# external_openstack_lbaas_use_octavia: true
# external_openstack_lbaas_method: "ROUND_ROBIN" # external_openstack_lbaas_method: "ROUND_ROBIN"
# external_openstack_lbaas_provider: "octavia"
# 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"

9
roles/kubernetes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-config.j2
View file

@ -30,7 +30,6 @@ ca-file="{{ kube_config_dir }}/external-openstack-cacert.pem"
{% endif %} {% endif %}
[LoadBalancer] [LoadBalancer]
use-octavia={{ external_openstack_lbaas_use_octavia | string | lower }}
create-monitor={{ external_openstack_lbaas_create_monitor }} create-monitor={{ external_openstack_lbaas_create_monitor }}
monitor-delay={{ external_openstack_lbaas_monitor_delay }} monitor-delay={{ external_openstack_lbaas_monitor_delay }}
monitor-timeout={{ external_openstack_lbaas_monitor_timeout }} monitor-timeout={{ external_openstack_lbaas_monitor_timeout }}
@ -56,8 +55,12 @@ manage-security-groups={{ external_openstack_lbaas_manage_security_groups }}
{% if external_openstack_lbaas_internal_lb is defined %} {% if external_openstack_lbaas_internal_lb is defined %}
internal-lb={{ external_openstack_lbaas_internal_lb }} internal-lb={{ external_openstack_lbaas_internal_lb }}
{% endif %} {% endif %}
{% if external_openstack_lbaas_use_octavia is defined and external_openstack_lbaas_use_octavia %} {% if external_openstack_lbaas_provider is defined %}
lb-provider={{ external_openstack_lbaas_provider }}
use-octavia={{ external_openstack_lbaas_provider | lower == 'octavia' }}
{% else %}
lb-provider=octavia lb-provider=octavia
use-octavia=true
{% endif %} {% endif %}
[Networking] [Networking]
@ -72,4 +75,4 @@ public-network-name="{{ network_name }}"
[Metadata] [Metadata]
{% if external_openstack_metadata_search_order is defined %} {% if external_openstack_metadata_search_order is defined %}
search-order="{{ external_openstack_metadata_search_order }}" search-order="{{ external_openstack_metadata_search_order }}"
{% endif %} {% endif %}