From 3b338ea9f19052eb4cf3dc70d9d49d03cb602ef2 Mon Sep 17 00:00:00 2001
From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Wed, 28 Mar 2018 13:50:33 +0400
Subject: [odl] Setup manager target after ovs host config

Change-Id: Ia517b7cf1723a5afaf43cb0709716f3a67a29e9f
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
---
 mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 | 2 +-
 mcp/config/scenario/os-odl-nofeature-noha.yaml  | 4 ++--
 mcp/config/states/opendaylight                  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'mcp/config')

diff --git a/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 b/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2
index 76b893eae..0bd3a1307 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 %}
-    - openstack_ha
     - opendaylight
+    - openstack_ha
     - networks
 virtual:
   nodes:
diff --git a/mcp/config/scenario/os-odl-nofeature-noha.yaml b/mcp/config/scenario/os-odl-nofeature-noha.yaml
index 96d4bcc27..f52eaf5aa 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
@@ -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 515420a7e..5bbf0d7a8 100755
--- a/mcp/config/states/opendaylight
+++ b/mcp/config/states/opendaylight
@@ -21,4 +21,4 @@ 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'"
-- 
cgit 1.2.3-korg