diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-05-24 09:46:33 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-05-25 10:28:32 -0300 |
| commit | 0c7433838c8c6409b8de907fcc946fc73fe90527 (patch) | |
| tree | 0e0138faf3cb685ac8dd51df79ee25f50c1111b6 /roles/openshift_master | |
| parent | 82a70f9cc1522d239212701ab6c9260cbf9dc8a7 (diff) | |
| download | openshift-0c7433838c8c6409b8de907fcc946fc73fe90527.tar.gz openshift-0c7433838c8c6409b8de907fcc946fc73fe90527.tar.bz2 openshift-0c7433838c8c6409b8de907fcc946fc73fe90527.tar.xz openshift-0c7433838c8c6409b8de907fcc946fc73fe90527.zip | |
Work towards determining openshift_version when unspecified.
openshift_docker role was largely useless now, but also almost did what
we needed. (deps ordering still needs to be changed)
Remove defaulting of openshift_version.
Diffstat (limited to 'roles/openshift_master')
| -rw-r--r-- | roles/openshift_master/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/roles/openshift_master/defaults/main.yml b/roles/openshift_master/defaults/main.yml index dbd62c80f..14a1daf6c 100644 --- a/roles/openshift_master/defaults/main.yml +++ b/roles/openshift_master/defaults/main.yml @@ -1,4 +1,4 @@ --- openshift_node_ips: [] # TODO: update setting these values based on the facts -openshift_version: "{{ openshift_pkg_version | default(openshift_image_tag | default(openshift.docker.openshift_image_tag | default(''))) }}" +#openshift_version: "{{ openshift_pkg_version | default(openshift_image_tag | default(openshift.docker.openshift_image_tag | default(''))) }}" diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 0cbb49758..6870def5f 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -25,8 +25,6 @@ msg: "Pacemaker based HA is not supported at this time when used with containerized installs" when: openshift_master_ha | bool and openshift_master_cluster_method == "pacemaker" and openshift.common.is_containerized | bool -- debug: var=openshift_version - - name: Install Master package action: "{{ ansible_pkg_mgr }} name={{ openshift.common.service_type }}-master{{ openshift_version | default('') | oo_image_tag_to_rpm_version(include_dash=True) }} state=present" when: not openshift.common.is_containerized | bool |