From 4d604967adde375eb24ae165aff83c11be89ca30 Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Thu, 28 Dec 2017 15:32:43 +0100
Subject: [netconfig] APT: Prefer ipv4 connections over ipv6

Ubuntu prefers ipv6 connections therefore in some networks, this
breaks software updates (it does a AAAA DNS lookup before A record
lookups). Let's prefer old style ipv4 connections over the new ipv6 in
order to save some processing and resource utilization.

Based on previous work from [1] (but without /etc/gai.conf, only APT).

[1] https://review.openstack.org/#/c/462502/

JIRA: FUEL-321

Change-Id: Ic3dff3baa1c0be9ac95972557d6a2d26641bfe1b
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
 .../classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml      | 4 ++++
 .../classes/cluster/virtual-mcp-pike-common-noha/infra/init.yml      | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml
index 731602f12..f2a6b4e68 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml
@@ -62,6 +62,10 @@ parameters:
             control_address: ${_param:openstack_proxy_node02_control_address}
   linux:
     system:
+      apt:
+        config:
+          prefer_ipv4:
+            Acquire::ForceIPv4: true
       user:
         ubuntu:
           enabled: true
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/init.yml
index 9ae8d1097..464048396 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/init.yml
@@ -10,6 +10,11 @@ parameters:
   _param:
     cluster_domain: ${_param:cluster_name}.local
   linux:
+    system:
+      apt:
+        config:
+          prefer_ipv4:
+            Acquire::ForceIPv4: true
     network:
       host:
         cfg01:
-- 
cgit