diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-09-04 16:29:58 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-09-04 16:29:58 -0400 |
| commit | 318ac6b9b65f42f032382114f35d3c9fa7f5610b (patch) | |
| tree | 45c0651d7785025f0e7a137d8abac0e66092a659 /roles/openshift_master | |
| parent | 110564d736ff005fbf46f3f6f05d1913bec51df5 (diff) | |
| parent | 633c651285b53ee154cd497513ded4a26c88d991 (diff) | |
| download | openshift-318ac6b9b65f42f032382114f35d3c9fa7f5610b.tar.gz openshift-318ac6b9b65f42f032382114f35d3c9fa7f5610b.tar.bz2 openshift-318ac6b9b65f42f032382114f35d3c9fa7f5610b.tar.xz openshift-318ac6b9b65f42f032382114f35d3c9fa7f5610b.zip | |
Merge pull request #558 from sdodson/version-pinning
Add openshift_version to set RPM versions
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 |