diff options
author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-03 13:09:59 -0500 |
---|---|---|
committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-03 13:09:59 -0500 |
commit | b40b5a26bb1a731dce16f3d0ba381a52ecd5dc8a (patch) | |
tree | 0bd81b49530746ed57609bc5770458ecdec08d7c /roles/openshift_common/tasks/main.yml | |
parent | fda67ef2addee2cb4cb982c8b9e0eb13bcf9ff7e (diff) | |
parent | 5ff53c80f23744bb5f40d60e2b7da504440f450f (diff) | |
download | openshift-b40b5a26bb1a731dce16f3d0ba381a52ecd5dc8a.tar.gz openshift-b40b5a26bb1a731dce16f3d0ba381a52ecd5dc8a.tar.bz2 openshift-b40b5a26bb1a731dce16f3d0ba381a52ecd5dc8a.tar.xz openshift-b40b5a26bb1a731dce16f3d0ba381a52ecd5dc8a.zip |
Merge pull request #1173 from abutcher/nfs-group
Refactor storage options
Diffstat (limited to 'roles/openshift_common/tasks/main.yml')
-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 }}" |