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_node | |
| 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_node')
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 6 | ||||
| -rw-r--r-- | roles/openshift_node/vars/main.yml | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index 11190ab72..1986b631e 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -31,12 +31,14 @@ sdn_mtu: "{{ openshift_node_sdn_mtu | default(None) }}" schedulable: "{{ openshift_schedulable | default(openshift_scheduleable) | default(None) }}" +# We have to add tuned-profiles in the same transaction otherwise we run into depsolving +# problems because the rpms don't pin the version properly. - name: Install Node package - yum: pkg={{ openshift.common.service_type }}-node state=present + yum: pkg={{ openshift.common.service_type }}-node{{ openshift_version }},tuned-profiles-{{ openshift.common.service_type }}-node{{ openshift_version }} state=present register: node_install_result - name: Install sdn-ovs package - yum: pkg={{ openshift.common.service_type }}-sdn-ovs state=present + yum: pkg={{ openshift.common.service_type }}-sdn-ovs{{ openshift_version }} state=present register: sdn_install_result when: openshift.common.use_openshift_sdn diff --git a/roles/openshift_node/vars/main.yml b/roles/openshift_node/vars/main.yml index 77a9694de..db2c3e15a 100644 --- a/roles/openshift_node/vars/main.yml +++ b/roles/openshift_node/vars/main.yml @@ -1,3 +1,4 @@ --- openshift_node_config_dir: "{{ openshift.common.config_base }}/node" openshift_node_config_file: "{{ openshift_node_config_dir }}/node-config.yaml" +openshift_version: "{{ openshift_version | default('') }}" |