diff options
author | 2017-09-04 20:14:53 +0000 | |
---|---|---|
committer | 2017-09-04 20:14:53 +0000 | |
commit | 1d46899bef2b9f2453044cbc9c9ac8cdd72468ee (patch) | |
tree | 8b1ee28645a046da266e350d0d88a35f75eac15e /puppet/services/opendaylight-ovs.yaml | |
parent | 58251b518c4d4f3145bccd28d7ed594ed1b61a81 (diff) | |
parent | fe975e8626b27817842eea0e4babbb7d72a919bf (diff) |
Merge "Use list_concat in place of yaql" into stable/pike
Diffstat (limited to 'puppet/services/opendaylight-ovs.yaml')
-rw-r--r-- | puppet/services/opendaylight-ovs.yaml | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/puppet/services/opendaylight-ovs.yaml b/puppet/services/opendaylight-ovs.yaml index 139ab7c7..c1cec4ff 100644 --- a/puppet/services/opendaylight-ovs.yaml +++ b/puppet/services/opendaylight-ovs.yaml @@ -141,22 +141,19 @@ outputs: step_config: | include tripleo::profile::base::neutron::plugins::ovs::opendaylight upgrade_tasks: - yaql: - expression: $.data.ovs_upgrade + $.data.opendaylight_upgrade - data: - ovs_upgrade: - get_attr: [Ovs, role_data, upgrade_tasks] - opendaylight_upgrade: - - name: Check if openvswitch is deployed - command: systemctl is-enabled openvswitch - tags: common - ignore_errors: True - register: openvswitch_enabled - - name: "PreUpgrade step0,validation: Check service openvswitch is running" - shell: /usr/bin/systemctl show 'openvswitch' --property ActiveState | grep '\bactive\b' - when: openvswitch_enabled.rc == 0 - tags: step0,validation - - name: Stop openvswitch service - tags: step1 - when: openvswitch_enabled.rc == 0 - service: name=openvswitch state=stopped + list_concat: + - get_attr: [Ovs, role_data, upgrade_tasks] + - + - name: Check if openvswitch is deployed + command: systemctl is-enabled openvswitch + tags: common + ignore_errors: True + register: openvswitch_enabled + - name: "PreUpgrade step0,validation: Check service openvswitch is running" + shell: /usr/bin/systemctl show 'openvswitch' --property ActiveState | grep '\bactive\b' + when: openvswitch_enabled.rc == 0 + tags: step0,validation + - name: Stop openvswitch service + tags: step1 + when: openvswitch_enabled.rc == 0 + service: name=openvswitch state=stopped |