aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/scenario
diff options
context:
space:
mode:
Diffstat (limited to 'deploy/scenario')
-rw-r--r--deploy/scenario/README5
-rw-r--r--deploy/scenario/ha_heat_ceilometer_scenario.yaml5
-rw-r--r--deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml5
-rw-r--r--deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml11
-rw-r--r--deploy/scenario/ha_odl-bgpvpn_scenario.yaml5
-rw-r--r--deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml5
-rw-r--r--deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml5
-rw-r--r--deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml5
-rw-r--r--deploy/scenario/ha_onos_nofeature_heat_ceilometer_scenario.yaml5
-rw-r--r--deploy/scenario/ha_onos_sfc_heat_ceilometer_scenario.yaml5
-rw-r--r--deploy/scenario/ha_vlan_heat_ceilometer_scenario.yaml5
-rw-r--r--deploy/scenario/no-ha_heat_ceilometer_scenario.yaml4
-rw-r--r--deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario.yaml4
-rw-r--r--deploy/scenario/no-ha_nfv-kvm_nfv-ovs_heat_ceilometer_scenario.yaml4
-rw-r--r--deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml6
-rw-r--r--deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml8
-rw-r--r--deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml8
-rw-r--r--deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml8
-rw-r--r--deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml8
-rw-r--r--deploy/scenario/no-ha_onos_nofeature_heat_ceilometer_scenario.yaml4
-rw-r--r--deploy/scenario/no-ha_onos_sfc_heat_ceilometer_scenario.yaml4
-rw-r--r--deploy/scenario/no-ha_vlan_heat_ceilometer_scenario.yaml4
22 files changed, 12 insertions, 111 deletions
diff --git a/deploy/scenario/README b/deploy/scenario/README
index 3472f6630..e32262d0d 100644
--- a/deploy/scenario/README
+++ b/deploy/scenario/README
@@ -93,23 +93,18 @@ dea-override-config:
- id: 1
interfaces: interfaces_1
role: mongo,controller,opendaylight
- transformations: transformations_1
- id: 2
interfaces: interfaces_1
role: mongo,controller
- transformations: transformations_1
- id: 3
interfaces: interfaces_1
role: mongo,controller
- transformations: transformations_1
- id: 4
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
- id: 5
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
settings:
editable:
diff --git a/deploy/scenario/ha_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_heat_ceilometer_scenario.yaml
index 8ab5f9277..4051c478a 100644
--- a/deploy/scenario/ha_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_heat_ceilometer_scenario.yaml
@@ -41,23 +41,18 @@ dea-override-config:
- id: 1
interfaces: interfaces_1
role: controller
- transformations: transformations_1
- id: 2
interfaces: interfaces_1
role: mongo, controller
- transformations: transformations_1
- id: 3
interfaces: interfaces_1
role: ceph-osd,controller
- transformations: transformations_1
- id: 4
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
- id: 5
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
dha-override-config:
nodes:
diff --git a/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml
index 828569bb7..1217f7273 100644
--- a/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml
@@ -46,23 +46,18 @@ dea-override-config:
- id: 1
interfaces: interfaces_1
role: controller,mongo
- transformations: transformations_1
- id: 2
interfaces: interfaces_1
role: controller
- transformations: transformations_1
- id: 3
interfaces: interfaces_1
role: controller
- transformations: transformations_1
- id: 4
interfaces: interfaces_1
role: compute,ceph-osd
- transformations: transformations_1
- id: 5
interfaces: interfaces_1
role: compute,ceph-osd
- transformations: transformations_1
settings:
editable:
diff --git a/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml
index 7b9f28d85..51deb4e28 100644
--- a/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml
@@ -54,26 +54,21 @@ dea-override-config:
net_segment_type: vlan
nodes:
- id: 1
- interfaces: interfaces_dpdk
+ interfaces: interfaces_vlan
role: controller
- transformations: transformations_vlan
- id: 2
- interfaces: interfaces_dpdk
+ interfaces: interfaces_vlan
role: mongo,controller
- transformations: transformations_vlan
- id: 3
- interfaces: interfaces_dpdk
+ interfaces: interfaces_vlan
role: ceph-osd,controller
- transformations: transformations_vlan
- id: 4
interfaces: interfaces_dpdk
role: ceph-osd,compute
- transformations: transformations_dpdk
attributes: attributes_1
- id: 5
interfaces: interfaces_dpdk
role: ceph-osd,compute
- transformations: transformations_dpdk
attributes: attributes_1
attributes_1:
diff --git a/deploy/scenario/ha_odl-bgpvpn_scenario.yaml b/deploy/scenario/ha_odl-bgpvpn_scenario.yaml
index 2257cbb70..7d52e77e2 100644
--- a/deploy/scenario/ha_odl-bgpvpn_scenario.yaml
+++ b/deploy/scenario/ha_odl-bgpvpn_scenario.yaml
@@ -59,23 +59,18 @@ dea-override-config:
- id: 1
interfaces: interfaces_1
role: controller,opendaylight
- transformations: transformations_1
- id: 2
interfaces: interfaces_1
role: mongo,controller
- transformations: transformations_1
- id: 3
interfaces: interfaces_1
role: ceph-osd,controller
- transformations: transformations_1
- id: 4
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
- id: 5
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
dha-override-config:
diff --git a/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml
index 0d16a3d65..90c89aedc 100644
--- a/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml
@@ -60,23 +60,18 @@ dea-override-config:
- id: 1
interfaces: interfaces_1
role: controller,opendaylight
- transformations: transformations_1
- id: 2
interfaces: interfaces_1
role: mongo,controller
- transformations: transformations_1
- id: 3
interfaces: interfaces_1
role: ceph-osd,controller
- transformations: transformations_1
- id: 4
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
- id: 5
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
dha-override-config:
nodes:
diff --git a/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
index a900720f9..e6aef2aba 100644
--- a/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
@@ -76,23 +76,18 @@ dea-override-config:
- id: 1
interfaces: interfaces_1
role: controller,opendaylight
- transformations: transformations_1
- id: 2
interfaces: interfaces_1
role: mongo,controller
- transformations: transformations_1
- id: 3
interfaces: interfaces_1
role: ceph-osd,controller
- transformations: transformations_1
- id: 4
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
- id: 5
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
dha-override-config:
nodes:
- id: 1
diff --git a/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml
index e222582d2..0dda3b3ca 100644
--- a/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml
@@ -66,23 +66,18 @@ dea-override-config:
- id: 1
interfaces: interfaces_1
role: controller,opendaylight
- transformations: transformations_1
- id: 2
interfaces: interfaces_1
role: mongo,controller
- transformations: transformations_1
- id: 3
interfaces: interfaces_1
role: ceph-osd,controller
- transformations: transformations_1
- id: 4
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
- id: 5
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
settings:
editable:
public_network_assignment:
diff --git a/deploy/scenario/ha_onos_nofeature_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_onos_nofeature_heat_ceilometer_scenario.yaml
index cb46af569..f813458d0 100644
--- a/deploy/scenario/ha_onos_nofeature_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_onos_nofeature_heat_ceilometer_scenario.yaml
@@ -67,23 +67,18 @@ dea-override-config:
- id: 1
interfaces: interfaces_1
role: controller,onos
- transformations: transformations_1
- id: 2
interfaces: interfaces_1
role: mongo,controller
- transformations: transformations_1
- id: 3
interfaces: interfaces_1
role: ceph-osd,controller
- transformations: transformations_1
- id: 4
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
- id: 5
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
settings:
editable:
public_network_assignment:
diff --git a/deploy/scenario/ha_onos_sfc_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_onos_sfc_heat_ceilometer_scenario.yaml
index e9dd0e196..32fbfcf6c 100644
--- a/deploy/scenario/ha_onos_sfc_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_onos_sfc_heat_ceilometer_scenario.yaml
@@ -47,23 +47,18 @@ dea-override-config:
- id: 1
interfaces: interfaces_1
role: controller,onos
- transformations: transformations_1
- id: 2
interfaces: interfaces_1
role: mongo,controller
- transformations: transformations_1
- id: 3
interfaces: interfaces_1
role: ceph-osd,controller
- transformations: transformations_1
- id: 4
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
- id: 5
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
settings:
editable:
public_network_assignment:
diff --git a/deploy/scenario/ha_vlan_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_vlan_heat_ceilometer_scenario.yaml
index dc7868b56..d1d5191f0 100644
--- a/deploy/scenario/ha_vlan_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_vlan_heat_ceilometer_scenario.yaml
@@ -45,23 +45,18 @@ dea-override-config:
- id: 1
interfaces: interfaces_1
role: controller
- transformations: transformations_1
- id: 2
interfaces: interfaces_1
role: mongo,controller
- transformations: transformations_1
- id: 3
interfaces: interfaces_1
role: ceph-osd,controller
- transformations: transformations_1
- id: 4
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
- id: 5
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
settings:
editable:
diff --git a/deploy/scenario/no-ha_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_heat_ceilometer_scenario.yaml
index c21585979..3dd5f841e 100644
--- a/deploy/scenario/no-ha_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_heat_ceilometer_scenario.yaml
@@ -41,19 +41,15 @@ dea-override-config:
- id: 1
interfaces: interfaces_1
role: mongo,controller
- transformations: transformations_1
- id: 2
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
- id: 3
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
- id: 4
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
dha-override-config:
# disks:
diff --git a/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario.yaml
index 779c6e14a..4661a263d 100644
--- a/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario.yaml
@@ -48,19 +48,15 @@ dea-override-config:
- id: 1
interfaces: interfaces_1
role: mongo,controller
- transformations: transformations_1
- id: 2
interfaces: interfaces_1
role: ceph-osd
- transformations: transformations_1
- id: 3
interfaces: interfaces_1
role: compute
- transformations: transformations_1
- id: 4
interfaces: interfaces_1
role: compute
- transformations: transformations_1
settings:
editable:
diff --git a/deploy/scenario/no-ha_nfv-kvm_nfv-ovs_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_nfv-kvm_nfv-ovs_heat_ceilometer_scenario.yaml
index 56251215a..87364e83a 100644
--- a/deploy/scenario/no-ha_nfv-kvm_nfv-ovs_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_nfv-kvm_nfv-ovs_heat_ceilometer_scenario.yaml
@@ -55,19 +55,15 @@ dea-override-config:
- id: 1
interfaces: interfaces_1
role: mongo,controller
- transformations: transformations_1
- id: 2
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_2
- id: 3
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_2
- id: 4
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_2
settings:
editable:
additional_components:
diff --git a/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml
index 847928670..7ab76cbcf 100644
--- a/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml
@@ -54,23 +54,19 @@ dea-override-config:
net_segment_type: vlan
nodes:
- id: 1
- interfaces: interfaces_dpdk
+ interfaces: interfaces_vlan
role: mongo,controller
- transformations: transformations_vlan
- id: 2
interfaces: interfaces_dpdk
role: ceph-osd,compute
- transformations: transformations_dpdk
attributes: attributes_1
- id: 3
interfaces: interfaces_dpdk
role: ceph-osd,compute
- transformations: transformations_dpdk
attributes: attributes_1
- id: 4
interfaces: interfaces_dpdk
role: ceph-osd,compute
- transformations: transformations_dpdk
attributes: attributes_1
attributes_1:
diff --git a/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml b/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml
index 333ff5af5..6f21ea2c8 100644
--- a/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml
+++ b/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml
@@ -59,20 +59,16 @@ dea-override-config:
nodes:
- id: 1
interfaces: interfaces_1
- role: mongo,controller,opendaylight
- transformations: transformations_1
+ role: mongo,controller
- id: 2
interfaces: interfaces_1
- role: ceph-osd,compute
- transformations: transformations_1
+ role: ceph-osd,opendaylight
- id: 3
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
- id: 4
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
dha-override-config:
# disks:
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..f8787d780 100644
--- a/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml
@@ -60,20 +60,16 @@ dea-override-config:
nodes:
- id: 1
interfaces: interfaces_1
- role: mongo,controller,opendaylight
- transformations: transformations_1
+ role: mongo,controller
- id: 2
interfaces: interfaces_1
- role: ceph-osd,compute
- transformations: transformations_1
+ role: ceph-osd,opendaylight
- id: 3
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
- id: 4
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
dha-override-config:
# disks:
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..a8d9ed848 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,20 +76,16 @@ dea-override-config:
nodes:
- id: 1
interfaces: interfaces_1
- role: mongo,controller,opendaylight
- transformations: transformations_1
+ role: mongo,controller
- id: 2
interfaces: interfaces_1
- role: ceph-osd,compute
- transformations: transformations_1
+ role: ceph-osd,opendaylight
- id: 3
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
- id: 4
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
dha-override-config:
# disks:
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..5f800abad 100644
--- a/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml
@@ -65,20 +65,16 @@ dea-override-config:
nodes:
- id: 1
interfaces: interfaces_1
- role: mongo,controller,opendaylight
- transformations: transformations_1
+ role: mongo,controller
- id: 2
interfaces: interfaces_1
- role: ceph-osd,compute
- transformations: transformations_1
+ role: ceph-osd,opendaylight
- id: 3
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
- id: 4
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
settings:
editable:
public_network_assignment:
diff --git a/deploy/scenario/no-ha_onos_nofeature_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_onos_nofeature_heat_ceilometer_scenario.yaml
index c6f07a73c..f5c00f0c9 100644
--- a/deploy/scenario/no-ha_onos_nofeature_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_onos_nofeature_heat_ceilometer_scenario.yaml
@@ -68,19 +68,15 @@ dea-override-config:
- id: 1
interfaces: interfaces_1
role: mongo,controller,onos
- transformations: transformations_1
- id: 2
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
- id: 3
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
- id: 4
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
settings:
editable:
public_network_assignment:
diff --git a/deploy/scenario/no-ha_onos_sfc_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_onos_sfc_heat_ceilometer_scenario.yaml
index 80d73b335..587346ef4 100644
--- a/deploy/scenario/no-ha_onos_sfc_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_onos_sfc_heat_ceilometer_scenario.yaml
@@ -48,19 +48,15 @@ dea-override-config:
- id: 1
interfaces: interfaces_1
role: mongo,controller,onos
- transformations: transformations_1
- id: 2
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
- id: 3
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
- id: 4
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
settings:
editable:
public_network_assignment:
diff --git a/deploy/scenario/no-ha_vlan_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_vlan_heat_ceilometer_scenario.yaml
index 5df530f42..567ea9867 100644
--- a/deploy/scenario/no-ha_vlan_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_vlan_heat_ceilometer_scenario.yaml
@@ -45,19 +45,15 @@ dea-override-config:
- id: 1
interfaces: interfaces_1
role: mongo,controller
- transformations: transformations_1
- id: 2
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
- id: 3
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
- id: 4
interfaces: interfaces_1
role: ceph-osd,compute
- transformations: transformations_1
settings:
editable:
additional_components: