summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master_ca
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2015-09-03 15:30:03 -0400
committerScott Dodson <sdodson@redhat.com>2015-09-03 15:31:28 -0400
commit633c651285b53ee154cd497513ded4a26c88d991 (patch)
tree1e485de08c7669badc6c49515afee2209a6918bd /roles/openshift_master_ca
parent7d480fbab74ddc8f76279f32c1a64148e5844382 (diff)
downloadopenshift-633c651285b53ee154cd497513ded4a26c88d991.tar.gz
openshift-633c651285b53ee154cd497513ded4a26c88d991.tar.bz2
openshift-633c651285b53ee154cd497513ded4a26c88d991.tar.xz
openshift-633c651285b53ee154cd497513ded4a26c88d991.zip
Add openshift_version to set RPM versions
Mostly necessary for debugging / testing upgrade paths
Diffstat (limited to 'roles/openshift_master_ca')
-rw-r--r--roles/openshift_master_ca/tasks/main.yml2
-rw-r--r--roles/openshift_master_ca/vars/main.yml1
2 files changed, 2 insertions, 1 deletions
diff --git a/roles/openshift_master_ca/tasks/main.yml b/roles/openshift_master_ca/tasks/main.yml
index 303dc9c5d..5c9639ea5 100644
--- a/roles/openshift_master_ca/tasks/main.yml
+++ b/roles/openshift_master_ca/tasks/main.yml
@@ -1,6 +1,6 @@
---
- name: Install the base package for admin tooling
- yum: pkg={{ openshift.common.service_type }} state=present
+ yum: pkg={{ openshift.common.service_type }}{{ openshift_version }} state=present
register: install_result
- name: Reload generated facts
diff --git a/roles/openshift_master_ca/vars/main.yml b/roles/openshift_master_ca/vars/main.yml
index 1f6af808c..9e9561e02 100644
--- a/roles/openshift_master_ca/vars/main.yml
+++ b/roles/openshift_master_ca/vars/main.yml
@@ -3,3 +3,4 @@ openshift_master_config_dir: "{{ openshift.common.config_base }}/master"
openshift_master_ca_cert: "{{ openshift_master_config_dir }}/ca.crt"
openshift_master_ca_key: "{{ openshift_master_config_dir }}/ca.key"
openshift_master_ca_serial: "{{ openshift_master_config_dir }}/ca.serial.txt"
+openshift_version: "{{ openshift_version | default('') }}"