From e748a8a56b1f2c5456952be927e46eb6b4e8be2c Mon Sep 17 00:00:00 2001
From: David Moreau-Simard <dms@redhat.com>
Date: Sat, 16 Sep 2017 17:09:03 -0600
Subject: [PATCH] Multi-node: Streamline multi-node-known-hosts

We're now evaluating the condition whether or not to run this role
at the playbook level instead since there are different roles using
this same condition.

Change-Id: I99738c7e98133838f989ed369a09ecb6a7b64054
---
 roles/multi-node-known-hosts/tasks/main.yaml         | 12 +++++++++---
 .../tasks/setup-multinode-known-hosts.yaml           | 10 ----------
 2 files changed, 9 insertions(+), 13 deletions(-)
 delete mode 100644 roles/multi-node-known-hosts/tasks/setup-multinode-known-hosts.yaml

diff --git a/roles/multi-node-known-hosts/tasks/main.yaml b/roles/multi-node-known-hosts/tasks/main.yaml
index 18763df7c..30fdcf0f7 100644
--- a/roles/multi-node-known-hosts/tasks/main.yaml
+++ b/roles/multi-node-known-hosts/tasks/main.yaml
@@ -1,3 +1,9 @@
-- name: Setup known_hosts for cross-node SSH'ing when we have more than 1 host
-  include: setup-multinode-known-hosts.yaml
-  when: hostvars|length > 1
+- name: Get known_hosts facts
+  generate_all_known_hosts:
+    hostvars: "{{ hostvars }}"
+
+- name: add known_host record for every public key of every other ip, hostname
+  known_hosts:
+    name: "{{ item.name }}"
+    key: "{{ item.key }}"
+  with_items: "{{ all_known_hosts }}"
diff --git a/roles/multi-node-known-hosts/tasks/setup-multinode-known-hosts.yaml b/roles/multi-node-known-hosts/tasks/setup-multinode-known-hosts.yaml
deleted file mode 100644
index ad41f6230..000000000
--- a/roles/multi-node-known-hosts/tasks/setup-multinode-known-hosts.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-- name: Get known_hosts facts
-  generate_all_known_hosts:
-    hostvars: "{{ hostvars }}"
-
-- name: add known_host record for every public key of every other ip, hostname
-  known_hosts:
-    name: "{{ item.name }}"
-    key: "{{ item.key }}"
-  with_items:
-    "{{ all_known_hosts }}"