From 0b0b9954c2d0602b1e9d0a387d2a195a790f8084 Mon Sep 17 00:00:00 2001 From: "Suren A. Chilingaryan" Date: Thu, 22 Mar 2018 04:37:46 +0100 Subject: Various fixes and provide ADEI admin container... --- roles/ands_facts/tasks/main.yml | 5 ----- roles/ands_facts/tasks/node.yml | 4 ++-- roles/ands_facts/tasks/nodes.yml | 1 + 3 files changed, 3 insertions(+), 7 deletions(-) (limited to 'roles/ands_facts/tasks') diff --git a/roles/ands_facts/tasks/main.yml b/roles/ands_facts/tasks/main.yml index 54c800a..5f1a5d7 100644 --- a/roles/ands_facts/tasks/main.yml +++ b/roles/ands_facts/tasks/main.yml @@ -1,9 +1,4 @@ --- -# We need all mount points ready -- name: "Run mount -a" - command: mount -a - changed_when: false - # Here we set 'openshift_hostname', 'openshift_ip' and other variables - name: "Configuring network facts" include_tasks: "network.yml" diff --git a/roles/ands_facts/tasks/node.yml b/roles/ands_facts/tasks/node.yml index e30442c..59d2d80 100644 --- a/roles/ands_facts/tasks/node.yml +++ b/roles/ands_facts/tasks/node.yml @@ -1,5 +1,5 @@ -- name: "Associating public host names with ids" +- name: "Associating public host names with ids (host_id: {{ host_id }})" set_fact: "ands_host_{{ host_id }}_public_hostname={{ host.value['ands_openshift_public_hostname'] }}" -- name: "Associating openshift fqdn with ids" +- name: "Associating openshift fqdn with ids (host_id: {{ host_id }})" set_fact: "ands_host_{{ host_id }}_openshift_fqdn={{ host.value['ands_openshift_fqdn'] }}" diff --git a/roles/ands_facts/tasks/nodes.yml b/roles/ands_facts/tasks/nodes.yml index ebe8091..d9f61df 100644 --- a/roles/ands_facts/tasks/nodes.yml +++ b/roles/ands_facts/tasks/nodes.yml @@ -3,6 +3,7 @@ run_once: true delegate_to: "{{ groups['masters'][0] }}" with_dict: "{{ hostvars }}" + when: host.key in groups['ands'] vars: host_id: "{{ host.value['ands_host_id'] }}" host_name: "{{ host.value['ansible_hostname'] }}" -- cgit v1.2.3