From e083cf6350a227da161b07d2c68d9aa200611b32 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Fri, 30 Mar 2018 13:37:36 +0400 Subject: Re-order opendaylight state * return back opendaylight state after neutron setup * sleep for awhile to let neutron api reconnect to the ODL controller and agents to register on server Change-Id: Ife0c7d3cc20574b0733e8e3064843c680379cc84 Signed-off-by: Michael Polenchuk --- mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 | 2 +- mcp/config/scenario/os-odl-nofeature-noha.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'mcp/config/scenario') 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 f52eaf5aa..260e1bacb 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: -- cgit