summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Skalski <mskalski@mirantis.com>2016-09-01 11:13:32 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-09-01 11:13:32 +0000
commit72613c121a3c28f43436bf26b8f65369fc46f520 (patch)
tree7cf0a4a6b96a42d878546b824fbaf69630c2710c
parentcb7f00257d567a1da7d820cb03c15723ca5bd28c (diff)
parent17718860d05a5b1a94f1e7d819b08cfbd24ed5c6 (diff)
Merge "Shift opendaylight role out of controller"
-rw-r--r--deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml4
-rw-r--r--deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml4
-rw-r--r--deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml4
-rw-r--r--deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml4
4 files changed, 8 insertions, 8 deletions
diff --git a/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml b/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml
index 333ff5af5..08b46feca 100644
--- 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 55af51f9e..e90f7e720 100644
--- 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 58fdd07b8..218378de3 100644
--- 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 bb0e28db2..7fa7829f2 100644
--- 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