[PATCH v2 06/10] bringup: move the update_etc_hosts task to run early

[Scott Mayhew <smayhew@redhat.com>]

Previously, update_etc_hosts was run after all of the other bringup
dependencies.  Fix this by making it an early (i.e.
KDEVOPS_BRING_UP_DEPS_EARLY) task.  This serves two purposes.  First,
it allows the top-level makefiles to be cleaned up a bit.  Second, it
allows other bringup tasks (i.e. KDEVOPS_BRING_UP_DEPS and
KDEVOPS_BRING_UP_LATE_DEPS tasks) to rely on the fact that /etc/hosts
has already been updated on the target hosts.

Signed-off-by: Scott Mayhew <smayhew@redhat.com>
---
 Makefile                                        |  1 +
 playbooks/roles/update_etc_hosts/tasks/main.yml | 14 +++++++++-----
 playbooks/update_etc_hosts.yml                  |  1 +
 scripts/bringup.Makefile                        |  6 +-----
 scripts/update_etc_hosts.Makefile               |  7 +++++++
 5 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 scripts/update_etc_hosts.Makefile

diff --git a/Makefile b/Makefile
index 9ca3a5f3..e0cb89c5 100644
--- a/Makefile
+++ b/Makefile
@@ -95,6 +95,7 @@ ANSIBLE_EXTRA_ARGS += $(LOCAL_DEVELOPMENT_ARGS)
 include scripts/provision.Makefile
 include scripts/systemd-timesync.Makefile
 include scripts/journal-server.Makefile
+include scripts/update_etc_hosts.Makefile
 
 KDEVOPS_BRING_UP_DEPS += $(KDEVOPS_BRING_UP_DEPS_EARLY)
 KDEVOPS_BRING_UP_DEPS += $(KDEVOPS_PROVISIONED_DEVCONFIG)
diff --git a/playbooks/roles/update_etc_hosts/tasks/main.yml b/playbooks/roles/update_etc_hosts/tasks/main.yml
index 34a69f6d..694d08db 100644
--- a/playbooks/roles/update_etc_hosts/tasks/main.yml
+++ b/playbooks/roles/update_etc_hosts/tasks/main.yml
@@ -1,8 +1,4 @@
-- name: Gather network facts
-  ansible.builtin.setup:
-    gather_subset:
-      - 'network'
-
+---
 - name: Import optional extra_args file
   include_vars: "{{ item }}"
   ignore_errors: yes
@@ -14,6 +10,14 @@
       skip: true
   tags: vars
 
+- name: Wait for hosts to become available
+  wait_for_connection:
+
+- name: Gather network facts
+  ansible.builtin.setup:
+    gather_subset:
+      - 'network'
+
 - name: Build network address
   set_fact:
     private_network: "{{ terraform_private_net_prefix }}/{{ terraform_private_net_mask }}"
diff --git a/playbooks/update_etc_hosts.yml b/playbooks/update_etc_hosts.yml
index 89a63773..a0c21741 100644
--- a/playbooks/update_etc_hosts.yml
+++ b/playbooks/update_etc_hosts.yml
@@ -1,4 +1,5 @@
 ---
 - hosts: all
+  gather_facts: no
   roles:
     - role: update_etc_hosts
diff --git a/scripts/bringup.Makefile b/scripts/bringup.Makefile
index 5a477847..55e7d8d1 100644
--- a/scripts/bringup.Makefile
+++ b/scripts/bringup.Makefile
@@ -33,11 +33,7 @@ ifeq (y,$(CONFIG_KDEVOPS_SETUP_SIW))
 KDEVOPS_BRING_UP_DEPS += siw
 endif # KDEVOPS_SETUP_SIW
 
-update_etc_hosts:
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-f 30 -i hosts playbooks/update_etc_hosts.yml
-
-bringup: $(KDEVOPS_BRING_UP_DEPS) update_etc_hosts
+bringup: $(KDEVOPS_BRING_UP_DEPS)
 
 destroy: $(KDEVOPS_DESTROY_DEPS)
 
diff --git a/scripts/update_etc_hosts.Makefile b/scripts/update_etc_hosts.Makefile
new file mode 100644
index 00000000..e4eb0bca
--- /dev/null
+++ b/scripts/update_etc_hosts.Makefile
@@ -0,0 +1,7 @@
+update_etc_hosts:
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+		-f 30 -i hosts playbooks/update_etc_hosts.yml
+
+KDEVOPS_BRING_UP_DEPS_EARLY += update_etc_hosts
+
+PHONY += update_etc_hosts
-- 
2.43.0