diff options
| author | Scott Dodson <sdodson@redhat.com> | 2015-09-03 15:30:03 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2015-09-03 15:31:28 -0400 |
| commit | 633c651285b53ee154cd497513ded4a26c88d991 (patch) | |
| tree | 1e485de08c7669badc6c49515afee2209a6918bd /roles/openshift_master | |
| parent | 7d480fbab74ddc8f76279f32c1a64148e5844382 (diff) | |
| download | openshift-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')
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_master/vars/main.yml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 4dad9b62f..b57711b58 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -56,7 +56,7 @@ controller_args: "{{ osm_controller_args | default(None) }}" - name: Install Master package - yum: pkg={{ openshift.common.service_type }}-master state=present + yum: pkg={{ openshift.common.service_type }}-master{{ openshift_version }} state=present register: install_result - name: Check for RPM generated config marker file /etc/origin/.config_managed diff --git a/roles/openshift_master/vars/main.yml b/roles/openshift_master/vars/main.yml index a61ba0397..cce118cf1 100644 --- a/roles/openshift_master/vars/main.yml +++ b/roles/openshift_master/vars/main.yml @@ -3,6 +3,7 @@ openshift_master_config_dir: "{{ openshift.common.config_base }}/master" openshift_master_config_file: "{{ openshift_master_config_dir }}/master-config.yaml" openshift_master_scheduler_conf: "{{ openshift_master_config_dir }}/scheduler.json" openshift_master_policy: "{{ openshift_master_config_dir }}/policy.json" +openshift_version: "{{ openshift_version | default('') }}" openshift_master_valid_grant_methods: - auto |