diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2020-01-20 12:26:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2020-01-20 12:26:12 +0000 |
| commit | d8275ad213d3f6a994a545e60b8c064870012d90 (patch) | |
| tree | 4c3c4bb20773745f61a5ee0fb9fa0fddda894b7e | |
| parent | 294399f6436b56989e46c6d3ca5d3b4c69b51573 (diff) | |
| parent | 871a4eecdac3e8ea2a5da6c4a2e3787f5e95f1c0 (diff) | |
Merge "odl: Make odl_hostconfig patching idempotent" into stable/iruya
| -rwxr-xr-x | mcp/config/states/opendaylight | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mcp/config/states/opendaylight b/mcp/config/states/opendaylight index eb6cc6524..ae8b4cc92 100755 --- a/mcp/config/states/opendaylight +++ b/mcp/config/states/opendaylight @@ -21,5 +21,7 @@ wait_for 5.0 "salt -I 'opendaylight:server' state.sls opendaylight" wait_for 20 "salt --out yaml -C 'I@neutron:server and *01*' network.connect $(odl bind_ip) $(odl rest_port) | fgrep -q 'result: true'" # https://bugs.launchpad.net/networking-odl/+bug/1822559 +FILE=/usr/lib/python3/dist-packages/networking_odl/cmd/set_ovs_hostconfigs.py +PFILE=/var/tmp/odl_hostconfig.patch salt -I 'linux:network:bridge:openvswitch' pkg.install python3-networking-odl -salt -I 'linux:network:bridge:openvswitch' file.patch /usr/lib/python3/dist-packages/networking_odl/cmd/set_ovs_hostconfigs.py /var/tmp/odl_hostconfig.patch || true +salt -I 'linux:network:bridge:openvswitch' cmd.run "patch -R -s --dry-run $FILE < $PFILE || patch $FILE < $PFILE" |