Code Review
/
fuel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Bring in Barbican service onboard"
[fuel.git]
/
mcp
/
config
/
states
/
opendaylight
diff --git
a/mcp/config/states/opendaylight
b/mcp/config/states/opendaylight
index
d00a773
..
de15d0c
100755
(executable)
--- 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
}
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'"
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