diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-04-06 18:19:12 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2018-04-06 18:19:12 +0000 |
commit | 360e605cda3e6bdeceb06cc0528c1cc0e6e60ed7 (patch) | |
tree | 3e54005ec018c0b884a378475e582cae69dd83df /mcp/config/scenario | |
parent | f285667a59e75d2357b0dff27249b4179dbf3d81 (diff) | |
parent | c1889c963bbe9b21645057e6e9cfcbe9c5f6434d (diff) |
Merge "Update opendaylight version to oxygen"
Diffstat (limited to 'mcp/config/scenario')
-rw-r--r-- | mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 | 2 | ||||
-rw-r--r-- | mcp/config/scenario/os-odl-nofeature-noha.yaml | 2 |
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: |