summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-04-12 17:07:48 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-04-12 17:07:48 -0400
commit73415fecc9c0020800b50067d439209b1f2e55da (patch)
tree1fb7d503ed23fcf2ce9709e3a3c23296aea68259
parent7967d127716de50f63dca9bd137f43ab642770bf (diff)
parentb6e6ac232bf47b89e213d4a52a51c5d161ed38ea (diff)
downloadopenshift-73415fecc9c0020800b50067d439209b1f2e55da.tar.gz
openshift-73415fecc9c0020800b50067d439209b1f2e55da.tar.bz2
openshift-73415fecc9c0020800b50067d439209b1f2e55da.tar.xz
openshift-73415fecc9c0020800b50067d439209b1f2e55da.zip
Merge pull request #1744 from smunilla/BZ1323918
Convert image_tag on masters
-rw-r--r--roles/openshift_master/tasks/main.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index 23994cdcf..18a42bf93 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -24,7 +24,7 @@
when: openshift_master_ha | bool and openshift_master_cluster_method == "pacemaker" and openshift.common.is_containerized | bool
- name: Install Master package
- action: "{{ ansible_pkg_mgr }} name={{ openshift.common.service_type }}-master{{ openshift_version }} state=present"
+ 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
- name: Pull master image