summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-04-02 16:10:22 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2018-04-03 19:46:23 +0400
commit3fdf9a951e8c7f5387b90d020ea6db38d85f3dd4 (patch)
tree92761d2bb788de85ea43defded9693891e00cc22
parent5d359f3396e5ca22b1aab2336c16908d7a5fd962 (diff)
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>
-rwxr-xr-xmcp/config/states/opendaylight4
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