From 67cde8a80875d5e8667813ba191ffbde29612202 Mon Sep 17 00:00:00 2001
From: caoyuan <cao.yuan@99cloud.net>
Date: Mon, 22 Jan 2018 22:19:52 +0800
Subject: [PATCH] Update kolla_internal_vip_address to kolla_internal_fqdn
1. use kolla_internal_fqdn to conf is better since it defined in
all.yml and the other project conf all use kolla_internal_fqdn [0].
2. remove the kolla-k8s comment
[0]: https://github.com/openstack/kolla-ansible/blob/master/ansible/roles/glance/templates/glance-api.conf.j2#L28
Change-Id: Ib3cb5aa6bb6102c5615f48b79c400ca693e5debd
---
ansible/group_vars/all.yml | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index eb1d6e436c..e0e79fd668 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -60,9 +60,6 @@ container_proxy:
https_proxy: "{{ container_https_proxy }}"
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
# to the api_interface. Allow the bind address to be an override.
api_interface_address: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
@@ -496,7 +493,7 @@ enable_destroy_images: "no"
# 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_kibana: "{{ 'yes' if enable_central_logging | bool else 'no' }}"