diff options
Diffstat (limited to 'mcp/config')
| -rw-r--r-- | mcp/config/scenario/os-odl-nofeature-noha.yaml | 2 | ||||
| -rwxr-xr-x | mcp/config/states/opendaylight | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/mcp/config/scenario/os-odl-nofeature-noha.yaml b/mcp/config/scenario/os-odl-nofeature-noha.yaml index 96d4bcc27..260e1bacb 100644 --- a/mcp/config/scenario/os-odl-nofeature-noha.yaml +++ b/mcp/config/scenario/os-odl-nofeature-noha.yaml @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB and others. +# Copyright (c) 2018 Mirantis Inc., Enea AB and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at diff --git a/mcp/config/states/opendaylight b/mcp/config/states/opendaylight index 515420a7e..d00a77352 100755 --- a/mcp/config/states/opendaylight +++ b/mcp/config/states/opendaylight @@ -21,4 +21,7 @@ function odl() { 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 '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 |