summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Bjurel <jonas.bjurel@ericsson.com>2016-02-10 19:57:15 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-02-10 19:57:16 +0000
commitef23f93854a54e89fe8c66e192603b0ec85dfe68 (patch)
tree5fdda2d7dd7e2121b9ebb32c46dd1c96a50fd10a
parent400ccd8fd50bc1d32f1baf141ebfe2270895c51c (diff)
parentc72e1ebe7248c81cce6039b1fe67c136cd1d4511 (diff)
Merge "Uplift scenario files to Liberty" into stable/brahmaputra
-rw-r--r--deploy/scenario/ha_odl-l2_bgpvpn_scenario_0.0.1.yaml2
-rw-r--r--deploy/scenario/no-ha_odl-l2_bgpvpn_scenario_0.0.1.yaml2
2 files changed, 2 insertions, 2 deletions
diff --git a/deploy/scenario/ha_odl-l2_bgpvpn_scenario_0.0.1.yaml b/deploy/scenario/ha_odl-l2_bgpvpn_scenario_0.0.1.yaml
index a5f3fc5e2..3890286e4 100644
--- a/deploy/scenario/ha_odl-l2_bgpvpn_scenario_0.0.1.yaml
+++ b/deploy/scenario/ha_odl-l2_bgpvpn_scenario_0.0.1.yaml
@@ -58,7 +58,7 @@ dea-override-config:
environment:
mode: ha
net_segment_type: tun
- wanted_release: Kilo on Ubuntu 14.04
+ wanted_release: Liberty on Ubuntu 14.04
nodes:
- id: 1
interfaces: interfaces_1
diff --git a/deploy/scenario/no-ha_odl-l2_bgpvpn_scenario_0.0.1.yaml b/deploy/scenario/no-ha_odl-l2_bgpvpn_scenario_0.0.1.yaml
index 780d9746a..0eecc0bce 100644
--- a/deploy/scenario/no-ha_odl-l2_bgpvpn_scenario_0.0.1.yaml
+++ b/deploy/scenario/no-ha_odl-l2_bgpvpn_scenario_0.0.1.yaml
@@ -58,7 +58,7 @@ dea-override-config:
environment:
mode: ha
net_segment_type: tun
- wanted_release: Kilo on Ubuntu 14.04
+ wanted_release: Liberty on Ubuntu 14.04
nodes:
- id: 1
interfaces: interfaces_1