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

Add additional configuration options to external Openstack CCM (#5661)

Browse source 
- Add support for manage-security-groups flag
- Add support for internal-lb flag
This commit is contained in:
Steven Reitsma 2020-02-26 22:03:19 +01:00 committed by GitHub
parent 171d2ce59c
commit d1acf7f192
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 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

@ -26,6 +26,8 @@
# external_openstack_lbaas_monitor_delay: "1m" # external_openstack_lbaas_monitor_delay: "1m"
# external_openstack_lbaas_monitor_timeout: "30s" # external_openstack_lbaas_monitor_timeout: "30s"
# external_openstack_lbaas_monitor_max_retries: "3" # external_openstack_lbaas_monitor_max_retries: "3"
# external_openstack_lbaas_manage_security_groups: false
# external_openstack_lbaas_internal_lb: false
## The tag of the external OpenStack Cloud Controller image ## The tag of the external OpenStack Cloud Controller image
# external_openstack_cloud_controller_image_tag: "latest" # external_openstack_cloud_controller_image_tag: "latest"

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

@ -36,6 +36,12 @@ subnet-id={{ external_openstack_lbaas_subnet_id }}
{% if external_openstack_lbaas_floating_network_id is defined %} {% if external_openstack_lbaas_floating_network_id is defined %}
floating-network-id={{ external_openstack_lbaas_floating_network_id }} floating-network-id={{ external_openstack_lbaas_floating_network_id }}
{% endif %} {% endif %}
{% if external_openstack_lbaas_flaoting_subnet_id is defined %} {% if external_openstack_lbaas_floating_subnet_id is defined %}
floating-subnet-id={{ external_openstack_lbaas_floating_subnet_id }} floating-subnet-id={{ external_openstack_lbaas_floating_subnet_id }}
{% endif %} {% endif %}
{% if external_openstack_lbaas_manage_security_groups is defined %}
manage-security-groups={{ external_openstack_lbaas_manage_security_groups }}
{% endif %}
{% if external_openstack_lbaas_internal_lb is defined %}
internal-lb={{ external_openstack_internal_lb }}
{% endif %}