From e3a3c672308953bec50e506f5f9d5ee8a73a0d0e Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Thu, 5 Apr 2018 17:55:25 +0400 Subject: Update opendaylight version to oxygen JIRA: FUEL-362 Change-Id: Ib2621bca72d1ba376af5d369edcf5fcf37e9788b Signed-off-by: Michael Polenchuk (cherry picked from commit c1889c963bbe9b21645057e6e9cfcbe9c5f6434d) --- mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 | 2 +- mcp/config/scenario/os-odl-nofeature-noha.yaml | 2 +- mcp/config/states/opendaylight | 4 ---- 3 files changed, 2 insertions(+), 6 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 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 -- cgit 1.2.3-korg