Add support for Kolla's enable_haproxy flag and allow it to be false
This requires us to use the controller host's IP address for the internal VIP.
This commit is contained in:
parent
614958486d
commit
2ef0a4bd58
@ -20,10 +20,10 @@
|
||||
- role: kolla-build
|
||||
|
||||
- role: kolla-ansible
|
||||
kolla_internal_vip_address: "{{ internal_net_name | net_vip_address }}"
|
||||
kolla_internal_fqdn: "{{ internal_net_name | net_fqdn or kolla_internal_vip_address }}"
|
||||
kolla_external_vip_address: "{{ external_net_name | net_vip_address }}"
|
||||
kolla_external_fqdn: "{{ external_net_name | net_fqdn or kolla_external_vip_address }}"
|
||||
kolla_internal_vip_address: "{% if kolla_enable_haproxy | bool %}{{ internal_net_name | net_vip_address }}{% elif controller_host %}{{ internal_net_name | net_ip(controller_host) }}{% endif %}"
|
||||
kolla_internal_fqdn: "{% if kolla_enable_haproxy | bool %}{{ internal_net_name | net_fqdn or kolla_internal_vip_address }}{% elif controller_host %}{{ internal_net_name | net_ip(controller_host) }}{% endif %}"
|
||||
kolla_external_vip_address: "{% if kolla_enable_haproxy | bool %}{{ external_net_name | net_vip_address }}{% elif controller_host %}{{ external_net_name | net_ip(controller_host) }}{% endif %}"
|
||||
kolla_external_fqdn: "{% if kolla_enable_haproxy | bool %}{{ external_net_name | net_fqdn or kolla_external_vip_address }}{% elif controller_host %}{{ external_net_name | net_ip(controller_host) }}{% endif %}"
|
||||
kolla_network_interface: "{% if controller_host %}{{ internal_net_name | net_interface(controller_host) | replace('-', '_') }}{% endif %}"
|
||||
kolla_external_vip_interface: "{% if controller_host %}{{ external_net_name | net_interface(controller_host) | replace('-', '_') }}{% endif %}"
|
||||
kolla_api_interface: "{% if controller_host %}{{ internal_net_name | net_interface(controller_host) | replace('-', '_') }}{% endif %}"
|
||||
|
@ -17,6 +17,7 @@ kolla_feature_flags:
|
||||
- etcd
|
||||
- gnocchi
|
||||
- grafana
|
||||
- haproxy
|
||||
- heat
|
||||
- horizon
|
||||
- influxdb
|
||||
|
@ -56,6 +56,7 @@
|
||||
#kolla_enable_etcd:
|
||||
#kolla_enable_gnocchi:
|
||||
#kolla_enable_grafana:
|
||||
#kolla_enable_haproxy:
|
||||
#kolla_enable_heat:
|
||||
#kolla_enable_horizon:
|
||||
#kolla_enable_influxdb:
|
||||
|
Loading…
Reference in New Issue
Block a user