Merge "Shift opendaylight role out of controller"

diff --git a/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml b/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml
index 333ff5a..08b46fe 100644 (file)
--- a/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml
+++ b/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml
@@ -59,11 +59,11 @@ dea-override-config:
   nodes:
   - id: 1
     interfaces: interfaces_1
-    role: mongo,controller,opendaylight
+    role: mongo,controller
     transformations: transformations_1
   - id: 2
     interfaces: interfaces_1
-    role: ceph-osd,compute
+    role: ceph-osd,opendaylight
     transformations: transformations_1
   - id: 3
     interfaces: interfaces_1

diff --git a/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml
index 55af51f..e90f7e7 100644 (file)
--- a/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml
@@ -60,11 +60,11 @@ dea-override-config:
   nodes:
   - id: 1
     interfaces: interfaces_1
-    role: mongo,controller,opendaylight
+    role: mongo,controller
     transformations: transformations_1
   - id: 2
     interfaces: interfaces_1
-    role: ceph-osd,compute
+    role: ceph-osd,opendaylight
     transformations: transformations_1
   - id: 3
     interfaces: interfaces_1

diff --git a/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
index 58fdd07..218378d 100644 (file)
--- a/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
@@ -76,11 +76,11 @@ dea-override-config:
   nodes:
   - id: 1
     interfaces: interfaces_1
-    role: mongo,controller,opendaylight
+    role: mongo,controller
     transformations: transformations_1
   - id: 2
     interfaces: interfaces_1
-    role: ceph-osd,compute
+    role: ceph-osd,opendaylight
     transformations: transformations_1
   - id: 3
     interfaces: interfaces_1

diff --git a/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml
index bb0e28d..7fa7829 100644 (file)
--- a/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml
@@ -65,11 +65,11 @@ dea-override-config:
   nodes:
   - id: 1
     interfaces: interfaces_1
-    role: mongo,controller,opendaylight
+    role: mongo,controller
     transformations: transformations_1
   - id: 2
     interfaces: interfaces_1
-    role: ceph-osd,compute
+    role: ceph-osd,opendaylight
     transformations: transformations_1
   - id: 3
     interfaces: interfaces_1