openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix ansible conditional for ovs upgrade."

This commit is contained in:
Zuul 2018-11-16 16:55:56 +00:00 committed by Gerrit Code Review
parent f190d35e52 49e9d44d00
commit 3694dee4b3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
puppet/services/tripleo-packages.yaml
View File

@ -109,7 +109,7 @@ outputs:
ignore_errors: true
- name: Set fact for triggering OpenvSwitch layered product package handling
set_fact:
ovs_lp_packaging: "{{ rhosp_package_result.rc }} == 0"
ovs_lp_packaging: "{{ rhosp_package_result.rc == 0 }}"
- name: Capture the expected OpenvSwitch version.
set_fact:
new_ovs_version: "{{ rhosp_package_result.stdout }}"
@ -149,7 +149,7 @@ outputs:
shell: |
rpm -e --noscripts --nopreun --nopostun --notriggers --nodeps $(rpm -qa 'openvswitch{{ package_suffix|default('') }}*' | grep -v 'selinux')
warn: false
when: "{{ new_ovs_version }} != {{ current_ovs_version }}"
when: new_ovs_version != current_ovs_version
- name: install/upgrade OpenvSwitch LP package
package:
name: rhosp-openvswitch