From ba4debd2aa9c808cd982030d3589443e87bb900e Mon Sep 17 00:00:00 2001 From: Andrew Butcher Date: Fri, 8 Apr 2016 12:36:42 -0400 Subject: Add openshift_hosted_facts role and remove hosted facts from openshift_common. --- roles/openshift_hosted_facts/meta/main.yml | 15 +++++++++++++++ roles/openshift_hosted_facts/tasks/main.yml | 9 +++++++++ 2 files changed, 24 insertions(+) create mode 100644 roles/openshift_hosted_facts/meta/main.yml create mode 100644 roles/openshift_hosted_facts/tasks/main.yml (limited to 'roles/openshift_hosted_facts') diff --git a/roles/openshift_hosted_facts/meta/main.yml b/roles/openshift_hosted_facts/meta/main.yml new file mode 100644 index 000000000..dd2de07bc --- /dev/null +++ b/roles/openshift_hosted_facts/meta/main.yml @@ -0,0 +1,15 @@ +--- +galaxy_info: + author: Andrew Butcher + description: OpenShift Hosted Facts + company: Red Hat, Inc. + license: Apache License, Version 2.0 + min_ansible_version: 1.9 + platforms: + - name: EL + versions: + - 7 + categories: + - cloud +dependencies: +- role: openshift_facts diff --git a/roles/openshift_hosted_facts/tasks/main.yml b/roles/openshift_hosted_facts/tasks/main.yml new file mode 100644 index 000000000..13e06e632 --- /dev/null +++ b/roles/openshift_hosted_facts/tasks/main.yml @@ -0,0 +1,9 @@ +--- +- name: Set hosted facts + openshift_facts: + role: hosted + openshift_env: "{{ item | oo_openshift_env }}" + no_log: true + with_items: + - "{{ hostvars[inventory_hostname] }}" + - "{{ hostvars }}" -- cgit v1.2.3 From 8591af8679e13374d9f13d8867679adee45a7d0d Mon Sep 17 00:00:00 2001 From: Andrew Butcher Date: Fri, 8 Apr 2016 16:14:49 -0400 Subject: Merge openshift_env hostvars. --- roles/openshift_hosted_facts/tasks/main.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'roles/openshift_hosted_facts') diff --git a/roles/openshift_hosted_facts/tasks/main.yml b/roles/openshift_hosted_facts/tasks/main.yml index 13e06e632..f595e1e81 100644 --- a/roles/openshift_hosted_facts/tasks/main.yml +++ b/roles/openshift_hosted_facts/tasks/main.yml @@ -2,8 +2,6 @@ - name: Set hosted facts openshift_facts: role: hosted - openshift_env: "{{ item | oo_openshift_env }}" - no_log: true - with_items: - - "{{ hostvars[inventory_hostname] }}" - - "{{ hostvars }}" + openshift_env: "{{ hostvars[inventory_hostname] + | oo_merge_dicts(hostvars) + | oo_openshift_env }}" -- cgit v1.2.3