From a76e5dbb11e1a78c779ff8a71256c95fd9f161f5 Mon Sep 17 00:00:00 2001 From: Bogdan Dobrelya Date: Wed, 20 Jul 2016 11:35:06 +0200 Subject: [PATCH] Fix set_facts visibility Move set_facts to the preinstall scope, so every role may see it. For example, network plugins to see the etcd_endpoint. Signed-off-by: Bogdan Dobrelya --- roles/etcd/tasks/main.yml | 1 - roles/kubernetes/preinstall/tasks/main.yml | 2 ++ roles/{etcd => kubernetes/preinstall}/tasks/set_facts.yml | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename roles/{etcd => kubernetes/preinstall}/tasks/set_facts.yml (100%) diff --git a/roles/etcd/tasks/main.yml b/roles/etcd/tasks/main.yml index 34d94ab73..733f6475b 100644 --- a/roles/etcd/tasks/main.yml +++ b/roles/etcd/tasks/main.yml @@ -1,5 +1,4 @@ --- -- include: set_facts.yml - include: install.yml - include: set_cluster_health.yml - include: configure.yml diff --git a/roles/kubernetes/preinstall/tasks/main.yml b/roles/kubernetes/preinstall/tasks/main.yml index 95cd134ce..c0dd65797 100644 --- a/roles/kubernetes/preinstall/tasks/main.yml +++ b/roles/kubernetes/preinstall/tasks/main.yml @@ -2,6 +2,8 @@ - include: gitinfos.yml when: run_gitinfos +- include: set_facts.yml + - name: gather os specific variables include_vars: "{{ item }}" with_first_found: diff --git a/roles/etcd/tasks/set_facts.yml b/roles/kubernetes/preinstall/tasks/set_facts.yml similarity index 100% rename from roles/etcd/tasks/set_facts.yml rename to roles/kubernetes/preinstall/tasks/set_facts.yml