aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/config/scenario
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-03-30 13:37:36 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2018-03-30 13:47:31 +0400
commite083cf6350a227da161b07d2c68d9aa200611b32 (patch)
tree8022c581b309a955a8f29a08d0131a8b892f0e49 /mcp/config/scenario
parentf3314c74504d8bc324211cd60241674f1998efd4 (diff)
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 <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/config/scenario')
-rw-r--r--mcp/config/scenario/os-odl-nofeature-ha.yaml.j22
-rw-r--r--mcp/config/scenario/os-odl-nofeature-noha.yaml2
2 files changed, 2 insertions, 2 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 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: