summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Brattain <ross.b.brattain@intel.com>2017-08-25 04:55:56 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-08-25 04:55:56 +0000
commite91ccae7fa21647cd2452cdb7dbec584bad6a476 (patch)
treec69c0d88225e86a1cbadd84c2aa61f854f36b2fe
parent564496eae84e4b8916d2102222eb95877a338b20 (diff)
parentaf144b5a9d3d6af894e7b527c193bf29435a8300 (diff)
Merge "Removed unnecessary image definitions and flavor names."
-rw-r--r--samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml3
-rw-r--r--samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml1
-rw-r--r--samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml1
3 files changed, 0 insertions, 5 deletions
diff --git a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
index 6fe826642..3c92e877f 100644
--- a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
@@ -44,7 +44,6 @@ context:
name: yardstick
image: yardstick-samplevnfs
flavor:
- name: yardstick-dpdk-flavor
vcpus: 10
ram: 20480
disk: 4
@@ -60,11 +59,9 @@ context:
vnf:
floating_ip: true
placement: "pgrp1"
- image: yardstick-vnfs
trafficgen_1:
floating_ip: true
placement: "pgrp1"
- image: yardstick-trex
networks:
mgmt:
cidr: '10.0.1.0/24'
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml
index 56d26be8b..516c727de 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml
@@ -43,7 +43,6 @@ context:
name: yardstick
image: yardstick-samplevnfs
flavor:
- name: yardstick-dpdk-flavor
vcpus: 10
ram: 20480
disk: 4
diff --git a/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
index 2e7ef3d3f..82e89a2a4 100644
--- a/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
@@ -44,7 +44,6 @@ context:
name: yardstick
image: yardstick-samplevnfs
flavor:
- name: yardstick-dpdk-flavor
vcpus: 10
ram: 20480
disk: 4