diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-03-23 16:47:46 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-03-23 16:53:46 +0400 |
| commit | b3b4b2e1bcd42f4628e53796c3dab81151f56bc2 (patch) | |
| tree | 1257d608dcab348dc7aee587c4f5810a8261f741 /mcp/config/states/opendaylight | |
| parent | 6d3951219e31c0fe50bee1489fb0a5124e9921f6 (diff) | |
Apply opendaylight state after ovs host config
* employ GA kernel for baremetal computes as well
* setup/start opendaylight server after ovs host config
Change-Id: Ic772aed544b17be02e6ca9ccd175f2288b2128a8
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/config/states/opendaylight')
| -rwxr-xr-x | mcp/config/states/opendaylight | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/mcp/config/states/opendaylight b/mcp/config/states/opendaylight index a698b8cac..515420a7e 100755 --- a/mcp/config/states/opendaylight +++ b/mcp/config/states/opendaylight @@ -1,6 +1,6 @@ #!/bin/bash -e ############################################################################## -# 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 @@ -9,6 +9,16 @@ CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x +# shellcheck disable=SC1090 +source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh" + +# Get OpenDaylight server options with prefix odl_ +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 'result: true'" |