diff options
Diffstat (limited to 'mcp/config')
| -rw-r--r-- | mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 | 2 | ||||
| -rw-r--r-- | mcp/config/scenario/os-odl-nofeature-noha.yaml | 2 | ||||
| -rwxr-xr-x | mcp/config/states/opendaylight | 12 |
3 files changed, 13 insertions, 3 deletions
diff --git a/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 b/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 index 0bd3a1307..76b893eae 100644 --- a/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 +++ b/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 @@ -23,8 +23,8 @@ cluster: {%- if conf.MCP_VCP %} - virtual_control_plane {%- endif %} - - opendaylight - openstack_ha + - opendaylight - networks virtual: nodes: diff --git a/mcp/config/scenario/os-odl-nofeature-noha.yaml b/mcp/config/scenario/os-odl-nofeature-noha.yaml index 35b290428..96d4bcc27 100644 --- a/mcp/config/scenario/os-odl-nofeature-noha.yaml +++ b/mcp/config/scenario/os-odl-nofeature-noha.yaml @@ -9,9 +9,9 @@ cluster: domain: mcp-pike-odl-noha.local states: - - opendaylight - openstack_noha - neutron_gateway + - opendaylight - networks virtual: nodes: 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'" |