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 "Heatstack create: fix str/bytes error in NamedTemporaryFile.write()"
[yardstick.git]
/
samples
/
ping.yaml
diff --git
a/samples/ping.yaml
b/samples/ping.yaml
index
b95c135
..
2d0a96d
100644
(file)
--- a/
samples/ping.yaml
+++ b/
samples/ping.yaml
@@
-12,6
+12,9
@@
schema: "yardstick:task:0.1"
schema: "yardstick:task:0.1"
+{% set provider = provider or none %}
+{% set physical_network = physical_network or 'physnet1' %}
+{% set segmentation_id = segmentation_id or none %}
scenarios:
-
type: Ping
scenarios:
-
type: Ping
@@
-31,9
+34,9
@@
scenarios:
context:
name: demo
context:
name: demo
- image:
cirros-0.3.3
+ image:
yardstick-image
flavor: yardstick-flavor
flavor: yardstick-flavor
- user:
cirros
+ user:
ubuntu
placement_groups:
pgrp1:
placement_groups:
pgrp1:
@@
-49,4
+52,10
@@
context:
networks:
test:
cidr: '10.0.1.0/24'
networks:
test:
cidr: '10.0.1.0/24'
-
+ {% if provider == "vlan" %}
+ provider: {{provider}}
+ physical_network: {{physical_network}}
+ {% if segmentation_id %}
+ segmentation_id: {{segmentation_id}}
+ {% endif %}
+ {% endif %}