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 "Add methods to get an existing stack"
[yardstick.git]
/
yardstick
/
benchmark
/
scenarios
/
networking
/
ping6_setup.bash
diff --git
a/yardstick/benchmark/scenarios/networking/ping6_setup.bash
b/yardstick/benchmark/scenarios/networking/ping6_setup.bash
index
f02dfa8
..
592ced3
100644
(file)
--- a/
yardstick/benchmark/scenarios/networking/ping6_setup.bash
+++ b/
yardstick/benchmark/scenarios/networking/ping6_setup.bash
@@
-15,8
+15,13
@@
openrc=$1
external_network=$2
echo "openrc=$openrc"
echo "external_network=$external_network"
external_network=$2
echo "openrc=$openrc"
echo "external_network=$external_network"
+echo "nameserver 8.8.4.4" >> /etc/resolv.conf
source $openrc
source $openrc
-wget https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-22-20150521.x86_64.qcow2 >/dev/null 2>&1
+
+fedora_img="Fedora-Cloud-Base-22-20150521.x86_64.qcow2"
+if [ ! -f "$fedora_img" ]; then
+ wget https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/${fedora_img} >/dev/null 2>&1
+fi
glance image-create --name 'Fedora22' --disk-format qcow2 \
--container-format bare --file ./Fedora-Cloud-Base-22-20150521.x86_64.qcow2
glance image-create --name 'Fedora22' --disk-format qcow2 \
--container-format bare --file ./Fedora-Cloud-Base-22-20150521.x86_64.qcow2
@@
-85,8
+90,8
@@
nova boot --image Fedora22 --flavor m1.small \
sleep 60
nova list
sleep 60
nova list
-# disable eth0-VM1, eth0-VM2 port-security
-for port in eth0-VM1 eth0-VM2
+# disable eth0-VM1, eth0-VM2
, eth0-vRouter, eth1-vRouter
port-security
+for port in eth0-VM1 eth0-VM2
eth0-vRouter eth1-vRouter
do
neutron port-update --no-security-groups $port
neutron port-update $port --port-security-enabled=False
do
neutron port-update --no-security-groups $port
neutron port-update $port --port-security-enabled=False