aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/config
diff options
context:
space:
mode:
Diffstat (limited to 'mcp/config')
-rw-r--r--mcp/config/scenario/os-odl-nofeature-ha.yaml.j22
-rw-r--r--mcp/config/scenario/os-odl-nofeature-noha.yaml2
-rwxr-xr-xmcp/config/states/opendaylight3
3 files changed, 5 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:
diff --git a/mcp/config/states/opendaylight b/mcp/config/states/opendaylight
index 5bbf0d7a8..d00a77352 100755
--- a/mcp/config/states/opendaylight
+++ b/mcp/config/states/opendaylight
@@ -22,3 +22,6 @@ 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 -q 'result: true'"
+
+# settle down neutron api and agents
+sleep 180