From b3b4b2e1bcd42f4628e53796c3dab81151f56bc2 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Fri, 23 Mar 2018 16:47:46 +0400 Subject: Apply opendaylight state after ovs host config * employ GA kernel for baremetal computes as well * setup/start opendaylight server after ovs host config Change-Id: Ic772aed544b17be02e6ca9ccd175f2288b2128a8 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 35b290428..96d4bcc27 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 1.2.3-korg