Merge "kolla_url: port is a string"
This commit is contained in:
commit
bd286db198
@ -28,6 +28,7 @@ def kolla_url(fqdn, protocol, port, path='', context='url'):
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
fqdn = put_address_in_context(fqdn, context)
|
fqdn = put_address_in_context(fqdn, context)
|
||||||
|
port = int(port)
|
||||||
|
|
||||||
if ((protocol == 'http' and port == 80) or
|
if ((protocol == 'http' and port == 80) or
|
||||||
(protocol == 'https' and port == 443) or
|
(protocol == 'https' and port == 443) or
|
||||||
|
@ -288,6 +288,7 @@
|
|||||||
voting: false
|
voting: false
|
||||||
files:
|
files:
|
||||||
- ^ansible/roles/haproxy/
|
- ^ansible/roles/haproxy/
|
||||||
|
- ^kolla_ansible/kolla_url.py
|
||||||
vars:
|
vars:
|
||||||
external_api_interface_name: vxlan2
|
external_api_interface_name: vxlan2
|
||||||
external_api_network_prefix: "192.0.3."
|
external_api_network_prefix: "192.0.3."
|
||||||
|
Loading…
x
Reference in New Issue
Block a user