openstack/kolla-ansible
Code Issues Proposed changes

Merge "Update kolla_internal_vip_address to kolla_internal_fqdn"

Browse Source
This commit is contained in:
Zuul 2018-03-14 07:26:14 +00:00 committed by Gerrit Code Review
commit d10e614876
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ansible/group_vars/all.yml
View File

@ -60,9 +60,6 @@ container_proxy:
https_proxy: "{{ container_https_proxy }}" https_proxy: "{{ container_https_proxy }}"
no_proxy: "{{ container_no_proxy }},{{ api_interface_address }},{{ kolla_internal_vip_address }}" no_proxy: "{{ container_no_proxy }},{{ api_interface_address }},{{ kolla_internal_vip_address }}"
####################
# kolla-kubernetes
####################
# By default, Kolla API services bind to the network address assigned # By default, Kolla API services bind to the network address assigned
# to the api_interface. Allow the bind address to be an override. # to the api_interface. Allow the bind address to be an override.
api_interface_address: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}" api_interface_address: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
@ -500,7 +497,7 @@ enable_destroy_images: "no"
# Logging options # Logging options
#################### ####################
elasticsearch_address: "{{ kolla_internal_vip_address }}" elasticsearch_address: "{{ kolla_internal_fqdn }}"
enable_elasticsearch: "{{ 'yes' if enable_central_logging | bool or enable_freezer | bool or enable_osprofiler | bool or enable_skydive | bool else 'no' }}" enable_elasticsearch: "{{ 'yes' if enable_central_logging | bool or enable_freezer | bool or enable_osprofiler | bool or enable_skydive | bool else 'no' }}"
enable_kibana: "{{ 'yes' if enable_central_logging | bool else 'no' }}" enable_kibana: "{{ 'yes' if enable_central_logging | bool else 'no' }}"