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_node | |
| 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_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 e56a666e9..7a862c99f 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -30,12 +30,14 @@ kubelet_args: "{{ openshift_node_kubelet_args | default(None) }}" sdn_mtu: "{{ openshift_node_sdn_mtu | 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('') }}" |