summaryrefslogtreecommitdiffstats
path: root/mcp/config/scenario
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-04-05 17:55:25 +0400
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-04-06 21:19:31 +0000
commite3a3c672308953bec50e506f5f9d5ee8a73a0d0e (patch)
treed2a979a71b0467fcacc0e2c8a3a8e77d05c247a7 /mcp/config/scenario
parentd673b5b75a803ee1484c39f544fff2ac8b81cac6 (diff)
Update opendaylight version to oxygen
JIRA: FUEL-362 Change-Id: Ib2621bca72d1ba376af5d369edcf5fcf37e9788b Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> (cherry picked from commit c1889c963bbe9b21645057e6e9cfcbe9c5f6434d)
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 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: