From 3fdf9a951e8c7f5387b90d020ea6db38d85f3dd4 Mon Sep 17 00:00:00 2001
From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Mon, 2 Apr 2018 16:10:22 +0400
Subject: 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>
---
mcp/config/states/opendaylight | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
(limited to 'mcp')
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
--
cgit