diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2016-01-19 14:50:55 -0500 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2016-02-01 17:05:55 -0500 |
| commit | 44e5ddc20e7069e5345f48426a69e725aa8ea1d4 (patch) | |
| tree | 638eb0ffb58c3482e2fd44766e867d6e68fac0f4 /roles/openshift_common | |
| parent | 3d3053062ee3bca175df6eb4dd66ff56237234ca (diff) | |
| download | openshift-44e5ddc20e7069e5345f48426a69e725aa8ea1d4.tar.gz openshift-44e5ddc20e7069e5345f48426a69e725aa8ea1d4.tar.bz2 openshift-44e5ddc20e7069e5345f48426a69e725aa8ea1d4.tar.xz openshift-44e5ddc20e7069e5345f48426a69e725aa8ea1d4.zip | |
Refactor registry storage options.
Diffstat (limited to 'roles/openshift_common')
| -rw-r--r-- | roles/openshift_common/tasks/main.yml | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml index ff8c3b50f..98b0b11ea 100644 --- a/roles/openshift_common/tasks/main.yml +++ b/roles/openshift_common/tasks/main.yml @@ -39,11 +39,15 @@ action: "{{ ansible_pkg_mgr }} name={{ openshift.common.service_type }}{{ openshift_version | default('') }} state=present" when: not openshift.common.is_containerized | bool -- name: Set version facts +# This invocation also updates the version facts which are necessary +# for setting the hostname below. +- name: openshift_facts openshift_facts: + role: hosted + openshift_env: "{{ hostvars[inventory_hostname] | oo_openshift_env }}" - # For enterprise versions < 3.1 and origin versions < 1.1 we want to set the - # hostname by default. +# For enterprise versions < 3.1 and origin versions < 1.1 we want to set the +# hostname by default. - set_fact: set_hostname_default: "{{ not openshift.common.version_greater_than_3_1_or_1_1 }}" |