diff options
Diffstat (limited to 'deploy')
| -rw-r--r-- | deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk-bar_heat_ceilometer_scenario.yaml | 29 | ||||
| -rw-r--r-- | deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml | 29 |
2 files changed, 6 insertions, 52 deletions
diff --git a/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk-bar_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk-bar_heat_ceilometer_scenario.yaml index 645f48d21..5f90320f1 100644 --- a/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk-bar_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk-bar_heat_ceilometer_scenario.yaml @@ -51,17 +51,15 @@ dea-override-config: fuel: FEATURE_GROUPS: - experimental - environment: - net_segment_type: vlan nodes: - id: 1 - interfaces: interfaces_vlan + interfaces: interfaces_1 role: controller - id: 2 - interfaces: interfaces_vlan + interfaces: interfaces_1 role: mongo,controller - id: 3 - interfaces: interfaces_vlan + interfaces: interfaces_1 role: ceph-osd,controller - id: 4 interfaces: interfaces_dpdk @@ -80,27 +78,6 @@ dea-override-config: value: '2048': 1024 - network: - networking_parameters: - segmentation_type: vlan - networks: - - cidr: null - gateway: null - ip_ranges: [] - meta: - configurable: false - map_priority: 2 - name: private - neutron_vlan_range: true - notation: null - render_addr_mask: null - render_type: null - seg_type: vlan - use_gateway: false - vlan_start: null - name: private - vlan_start: null - settings: editable: storage: diff --git a/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml index 784883513..cdf06de24 100644 --- a/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml @@ -46,17 +46,15 @@ dea-override-config: fuel: FEATURE_GROUPS: - experimental - environment: - net_segment_type: vlan nodes: - id: 1 - interfaces: interfaces_vlan + interfaces: interfaces_1 role: controller - id: 2 - interfaces: interfaces_vlan + interfaces: interfaces_1 role: mongo,controller - id: 3 - interfaces: interfaces_vlan + interfaces: interfaces_1 role: ceph-osd,controller - id: 4 interfaces: interfaces_dpdk @@ -75,27 +73,6 @@ dea-override-config: value: '2048': 1024 - network: - networking_parameters: - segmentation_type: vlan - networks: - - cidr: null - gateway: null - ip_ranges: [] - meta: - configurable: false - map_priority: 2 - name: private - neutron_vlan_range: true - notation: null - render_addr_mask: null - render_type: null - seg_type: vlan - use_gateway: false - vlan_start: null - name: private - vlan_start: null - settings: editable: storage: |