Use public VIP for Keystone API if SSL is enabled

Force OSTF and OpenStack clients to use cluster public
VIP instead of Keystone public VIP for authentication
if SSL is enabled for endpoints, because by design SSL
is configured only for public VIP.

Change-Id: I53e54918b893f507cbac7d716300546a825467ea
Closes-bug: #1533306
(cherry picked from commit 39b5aec35a)
This commit is contained in:
Artem Panchenko 2016-01-12 20:11:25 +02:00
parent 4ade03edf9
commit 0ce0ce0080
1 changed files with 2 additions and 1 deletions

View File

@ -788,7 +788,8 @@ class NailgunConfig(object):
self.volume.cinder_vmware_storage_az = "{0}-cinder".format(az)
def get_keystone_vip(self):
if 'service_endpoint' in self.network.raw_data:
if 'service_endpoint' in self.network.raw_data \
and not self.fuel.ssl_data:
keystone_vip = self.network.raw_data['service_endpoint']
elif 'vips' in self.network.raw_data:
vips_data = self.network.raw_data['vips']