Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Do not start collectd twice when SampleVNF is running on Baremetal"
[yardstick.git]
/
samples
/
vnf_samples
/
vnf_descriptors
/
vpe_vnf.yaml
diff --git
a/samples/vnf_samples/vnf_descriptors/vpe_vnf.yaml
b/samples/vnf_samples/vnf_descriptors/vpe_vnf.yaml
index
75041c3
..
95b0fa8
100644
(file)
--- a/
samples/vnf_samples/vnf_descriptors/vpe_vnf.yaml
+++ b/
samples/vnf_samples/vnf_descriptors/vpe_vnf.yaml
@@
-20,10
+20,18
@@
vnfd:vnfd-catalog:
description: vPe approximation using DPDK
mgmt-interface:
vdu-id: vpevnf-baremetal
description: vPe approximation using DPDK
mgmt-interface:
vdu-id: vpevnf-baremetal
+ {% if user is defined %}
user: '{{user}}' # Value filled by vnfdgen
user: '{{user}}' # Value filled by vnfdgen
+ {% endif %}
+ {% if password is defined %}
password: '{{password}}' # Value filled by vnfdgen
password: '{{password}}' # Value filled by vnfdgen
+ {% endif %}
+ {% if ip is defined %}
ip: '{{ip}}' # Value filled by vnfdgen
ip: '{{ip}}' # Value filled by vnfdgen
- host: '{{host}}' # Value filled by vnfdgen
+ {% endif %}
+ {% if key_filename is defined %}
+ key_filename: '{{key_filename}}' # Value filled by vnfdgen
+ {% endif %}
connection-point:
- name: xe0
type: VPORT
connection-point:
- name: xe0
type: VPORT