diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-04-05 17:49:46 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-04-05 17:49:46 +0000 |
| commit | d673b5b75a803ee1484c39f544fff2ac8b81cac6 (patch) | |
| tree | 567cacdb88a2143a4db0a3965fe0bb05f166b9c7 /mcp | |
| parent | 56fb9958821bb50780f005d96d08a5ef0e398deb (diff) | |
| parent | 9d2c60aba157836d72bbecc251577ebb07e10475 (diff) | |
Merge "Remove opendaylight service mask" into stable/fraser
Diffstat (limited to 'mcp')
| -rwxr-xr-x | mcp/config/states/opendaylight | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mcp/config/states/opendaylight b/mcp/config/states/opendaylight index d00a77352..ae25ffcf4 100755 --- a/mcp/config/states/opendaylight +++ b/mcp/config/states/opendaylight @@ -17,11 +17,9 @@ function odl() { salt --out txt -I 'opendaylight:server' pillar.get "opendaylight:server:odl_$1" | cut -d ' ' -f2 } -# TODO: use service.masked state instead once salt get updated to 2017.7.0+ -salt -I 'opendaylight:server' service.mask opendaylight 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'" +salt -I 'opendaylight:server' service.restart opendaylight # settle down neutron api and agents sleep 180 |