X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Fconfig%2Fstates%2Fopendaylight;h=de15d0cefe4789836e0eb3ecd62b80e545a0cf6c;hb=e0ee4b03e2eca114d6c2a852022df1776cd5b6a4;hp=d00a77352f7c13b85e995caf3c8a6defa51b3a48;hpb=5d359f3396e5ca22b1aab2336c16908d7a5fd962;p=fuel.git diff --git a/mcp/config/states/opendaylight b/mcp/config/states/opendaylight index d00a77352..de15d0cef 100755 --- a/mcp/config/states/opendaylight +++ b/mcp/config/states/opendaylight @@ -17,11 +17,5 @@ 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 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'" - -# settle down neutron api and agents -sleep 180