summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/tasks
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-06-14 09:06:39 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-06-15 09:50:01 -0300
commita836a35b63ff1476eca5a8545a6c11ab389026d0 (patch)
treeefb2a8e15e4464fc07e573d83c5f8a3d73f77251 /roles/openshift_master/tasks
parent04643670db5709358fe55916705a9ce15ff0bb1e (diff)
downloadopenshift-a836a35b63ff1476eca5a8545a6c11ab389026d0.tar.gz
openshift-a836a35b63ff1476eca5a8545a6c11ab389026d0.tar.bz2
openshift-a836a35b63ff1476eca5a8545a6c11ab389026d0.tar.xz
openshift-a836a35b63ff1476eca5a8545a6c11ab389026d0.zip
Always populate openshift_image_tag and openshift_pkg_version.
Allows the use of arbitrary tags, precise control over containers and rpms, and likely mixed environments.
Diffstat (limited to 'roles/openshift_master/tasks')
-rw-r--r--roles/openshift_master/tasks/main.yml5
1 files changed, 2 insertions, 3 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index 6b3893570..7a80ed8e3 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -1,7 +1,6 @@
---
# TODO: add ability to configure certificates given either a local file to
# point to or certificate contents, set in default cert locations.
-- debug: var=openshift_version
# Authentication Variable Validation
# TODO: validate the different identity provider kinds as well
@@ -25,12 +24,12 @@
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 | default('') | oo_image_tag_to_rpm_version(include_dash=True) }} state=present"
+ action: "{{ ansible_pkg_mgr }} name={{ openshift.common.service_type }}-master{{ openshift_pkg_version | default('') | oo_image_tag_to_rpm_version(include_dash=True) }} state=present"
when: not openshift.common.is_containerized | bool
- name: Pull master image
command: >
- docker pull {{ openshift.master.master_image }}{{ ':v' + openshift_version if openshift_version is defined and openshift_version != '' else '' }}
+ docker pull {{ openshift.master.master_image }}:{{ openshift_image_tag }}
when: openshift.common.is_containerized | bool
- name: Create openshift.common.data_dir