From 20d80311f0ba5e7d1c6300f0184f9b435d2f6207 Mon Sep 17 00:00:00 2001
From: pmontanari <patrick.montanari@gmail.com>
Date: Wed, 18 Oct 2017 12:42:00 +0200
Subject: [PATCH] Update main.yml (#1822)
* Update main.yml
Needs to set up resolv.conf before updating Yum cache otherwise no name resolution available (resolv.conf empty).
* Update main.yml
Removing trailing spaces
---
roles/kubernetes/preinstall/tasks/main.yml | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/roles/kubernetes/preinstall/tasks/main.yml b/roles/kubernetes/preinstall/tasks/main.yml
index 2b49b184d..1cbf55b78 100644
--- a/roles/kubernetes/preinstall/tasks/main.yml
+++ b/roles/kubernetes/preinstall/tasks/main.yml
@@ -97,6 +97,14 @@
- canal
- bootstrap-os
+- include: resolvconf.yml
+ when:
+ - dns_mode != 'none'
+ - resolvconf_mode == 'host_resolvconf'
+ tags:
+ - bootstrap-os
+ - resolvconf
+
- name: Update package management cache (YUM)
yum:
update_cache: yes
@@ -249,14 +257,6 @@
- bootstrap-os
- etchosts
-- include: resolvconf.yml
- when:
- - dns_mode != 'none'
- - resolvconf_mode == 'host_resolvconf'
- tags:
- - bootstrap-os
- - resolvconf
-
- include: dhclient-hooks.yml
when:
- dns_mode != 'none'
--
GitLab