aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-02-17 12:01:15 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-02-17 12:01:15 +0000
commit3e041c0521b104c005ad2c328594079a9c108672 (patch)
tree1f2ec5804117817004b665f0cee29f8a019266d2
parent053b65b95a25039c0569eb243bdb0a534eeedadd (diff)
parent630f12217bdd99c6b4204ff547df95437df73fa5 (diff)
Merge "KVMFORNFV: Updating the copyright information for kvmfornfv scenarios."
-rw-r--r--deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk-bar_heat_ceilometer_scenario.yaml6
-rw-r--r--deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml14
-rw-r--r--deploy/scenario/no-ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml17
3 files changed, 8 insertions, 29 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 ef77d91be..4eac053e1 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
@@ -1,6 +1,6 @@
##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# jonas.bjurel@ericsson.com
+# Copyright (c) 2017 Intel Corp. and others.
+# navyax.bathula@intel.com,mpolenchuk@mirantis.com
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Apache License, Version 2.0
# which accompanies this distribution, and is available at
@@ -24,7 +24,7 @@
deployment-scenario-metadata:
title: NFV KVM OVS-DPDK and Barometer HA deployment
version: 0.0.1
- created: Feb 6 2016
+ created: Feb 6 2017
comment: NFV KVM OVS-DPDK and Barometer
##############################################################################
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 0f37f9fd0..784883513 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
@@ -1,6 +1,6 @@
##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# jonas.bjurel@ericsson.com
+# Copyright (c) 2016 Intel Corp. and others.
+# navyax.bathula@intel.com,mpolenchuk@mirantis.com
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Apache License, Version 2.0
# which accompanies this distribution, and is available at
@@ -118,16 +118,6 @@ dea-override-config:
type: checkbox
value: true
weight: 30
- iser:
- description: 'High performance block storage: Cinder volumes over iSER protocol (iSCSI over RDMA). This feature requires SR-IOV capabilities in the NIC, and will use a dedicated virtual function for the storage network.'
- label: iSER protocol for volumes (Cinder)
- restrictions:
- - settings:storage.volumes_lvm.value != true or settings:common.libvirt_type.value != 'kvm'
- - action: hide
- condition: not ('experimental' in version:feature_groups)
- type: checkbox
- value: false
- weight: 11
dha-override-config:
nodes:
diff --git a/deploy/scenario/no-ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml
index c1cc7150f..f7144f058 100644
--- a/deploy/scenario/no-ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml
@@ -1,6 +1,6 @@
##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# jonas.bjurel@ericsson.com
+# Copyright (c) 2016 Intel Corp. and others.
+# navyax.bathula@intel.com,mpolenchuk@mirantis.com
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Apache License, Version 2.0
# which accompanies this distribution, and is available at
@@ -68,8 +68,7 @@ dea-override-config:
attributes_1:
hugepages:
dpdk:
- value: 256
- min: 256
+ value: 1024
nova:
value:
'2048': 1024
@@ -117,16 +116,6 @@ dea-override-config:
type: checkbox
value: true
weight: 30
- iser:
- description: 'High performance block storage: Cinder volumes over iSER protocol (iSCSI over RDMA). This feature requires SR-IOV capabilities in the NIC, and will use a dedicated virtual function for the storage network.'
- label: iSER protocol for volumes (Cinder)
- restrictions:
- - settings:storage.volumes_lvm.value != true or settings:common.libvirt_type.value != 'kvm'
- - action: hide
- condition: not ('experimental' in version:feature_groups)
- type: checkbox
- value: false
- weight: 11
dha-override-config:
# disks: