Remove opendaylight service mask

Nitrogen SR2 brought in weird behaviour into netvirt feature
configuration causing malfunction tunnels between client nodes
(e.g. gateway, computes). In order to work properly service
of opendaylight requires an explicit restart or reload by means
of salt formula.

Change-Id: I277da5ad2787f1005647e500b64c7ffa6051443b
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 3fdf9a951e8c7f5387b90d020ea6db38d85f3dd4)

diff --git a/mcp/config/states/opendaylight b/mcp/config/states/opendaylight
index d00a773..ae25ffc 100755 (executable)
--- 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