summaryrefslogtreecommitdiffstats
path: root/mcp/config
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-04-09 18:48:14 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-04-09 18:48:14 +0000
commit20de635a813e0b1ccc37162f00ba4908e8d4663e (patch)
tree90b679f77bd6e92bec553d76b9ad365d7683857c /mcp/config
parent2881499fa1eb9fe2d99d17ab82911d579079b567 (diff)
parente3a3c672308953bec50e506f5f9d5ee8a73a0d0e (diff)
Merge "Update opendaylight version to oxygen" into stable/fraser
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/opendaylight4
3 files changed, 2 insertions, 6 deletions
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 260e1bacb..f52eaf5aa 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 ae25ffcf4..1dd220e89 100755
--- a/mcp/config/states/opendaylight
+++ b/mcp/config/states/opendaylight
@@ -19,7 +19,3 @@ function odl() {
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'"
-salt -I 'opendaylight:server' service.restart opendaylight
-
-# settle down neutron api and agents
-sleep 180