diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-08 17:13:48 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-08 17:13:48 -0400 |
| commit | 64c81e42bbd859977c059c4b2a154d59382a7c27 (patch) | |
| tree | a88635dc132fac16c713f393feecf58cce31f19b /roles/openshift_hosted_facts | |
| parent | d6d9cba774291c821c9531aa05049a6e3e22d7ff (diff) | |
| parent | 8591af8679e13374d9f13d8867679adee45a7d0d (diff) | |
| download | openshift-64c81e42bbd859977c059c4b2a154d59382a7c27.tar.gz openshift-64c81e42bbd859977c059c4b2a154d59382a7c27.tar.bz2 openshift-64c81e42bbd859977c059c4b2a154d59382a7c27.tar.xz openshift-64c81e42bbd859977c059c4b2a154d59382a7c27.zip | |
Merge pull request #1733 from abutcher/hosted-facts
Fix hosted facts
Diffstat (limited to 'roles/openshift_hosted_facts')
| -rw-r--r-- | roles/openshift_hosted_facts/meta/main.yml | 15 | ||||
| -rw-r--r-- | roles/openshift_hosted_facts/tasks/main.yml | 7 |
2 files changed, 22 insertions, 0 deletions
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..f595e1e81 --- /dev/null +++ b/roles/openshift_hosted_facts/tasks/main.yml @@ -0,0 +1,7 @@ +--- +- name: Set hosted facts + openshift_facts: + role: hosted + openshift_env: "{{ hostvars[inventory_hostname] + | oo_merge_dicts(hostvars) + | oo_openshift_env }}" |