From e72a6cf6da2456c888d925b849ea544bba92f357 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C5=82awek=20Kap=C5=82o=C5=84ski?= <slawek@kaplonski.pl>
Date: Wed, 16 Aug 2017 20:31:27 +0000
Subject: [PATCH] Don't determine local IPv6 support if force_ip4=True

In case when user set in config to force usage of IPv4 shade
will not try to check if IPv6 is locally supported or not.

Change-Id: Id12df5de0de58bbe427301c8a32d4c622dfbcc99
Related-Bug: #2001001
---
 shade/openstackcloud.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/shade/openstackcloud.py b/shade/openstackcloud.py
index fd5eca380..935139bbc 100644
--- a/shade/openstackcloud.py
+++ b/shade/openstackcloud.py
@@ -297,7 +297,8 @@ class OpenStackCloud(
         self._legacy_clients = {}
         self._raw_clients = {}
 
-        self._local_ipv6 = _utils.localhost_supports_ipv6()
+        self._local_ipv6 = (
+            _utils.localhost_supports_ipv6() if not self.force_ipv4 else False)
 
         self.cloud_config = cloud_config