openstack/kayobe
Code Issues Proposed changes

Add support for Kolla's enable_haproxy flag and allow it to be false

Browse Source 
This requires us to use the controller host's IP address for the internal VIP.
This commit is contained in:
Mark Goddard 2017-02-16 10:44:35 +00:00
parent 614958486d
commit 2ef0a4bd58
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ansible/kolla.yml
View File

@ -20,10 +20,10 @@
- role: kolla-build - role: kolla-build
- role: kolla-ansible - role: kolla-ansible
kolla_internal_vip_address: "{{ internal_net_name | net_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: "{{ internal_net_name | net_fqdn or kolla_internal_vip_address }}" 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: "{{ external_net_name | net_vip_address }}" 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: "{{ external_net_name | net_fqdn or kolla_external_vip_address }}" 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_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_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 %}" kolla_api_interface: "{% if controller_host %}{{ internal_net_name | net_interface(controller_host) | replace('-', '_') }}{% endif %}"

1
ansible/roles/kolla-ansible/vars/main.yml
View File

@ -17,6 +17,7 @@ kolla_feature_flags:
- etcd - etcd
- gnocchi - gnocchi
- grafana - grafana
- haproxy
- heat - heat
- horizon - horizon
- influxdb - influxdb

1
etc/kayobe/kolla.yml
View File

@ -56,6 +56,7 @@
#kolla_enable_etcd: #kolla_enable_etcd:
#kolla_enable_gnocchi: #kolla_enable_gnocchi:
#kolla_enable_grafana: #kolla_enable_grafana:
#kolla_enable_haproxy:
#kolla_enable_heat: #kolla_enable_heat:
#kolla_enable_horizon: #kolla_enable_horizon:
#kolla_enable_influxdb: #kolla_enable_influxdb: