summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-05-27 07:41:56 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-05-27 07:41:56 +0000
commit37539fcf867c3ca06b220e3a4b766950ca710a74 (patch)
treeeec60e1d9eaa463e490ae3ac446ca0581ebb9dad
parent1b180fae8f1c15467facf3eebb3e9e68e43f3f06 (diff)
parent785ab148a518e535ce9e646a3f4e9f08d2f6a191 (diff)
Merge "Use flavor name instead of flavor id"
-rw-r--r--docs/userguide/troubleshooting.rst2
-rwxr-xr-xtestcases/OpenStack/healthcheck/healthcheck.sh8
2 files changed, 5 insertions, 5 deletions
diff --git a/docs/userguide/troubleshooting.rst b/docs/userguide/troubleshooting.rst
index 406aaad2a..99b92977b 100644
--- a/docs/userguide/troubleshooting.rst
+++ b/docs/userguide/troubleshooting.rst
@@ -89,7 +89,7 @@ is not **ACTIVE**), you can check why it failed by doing::
It might show some messages about the booting failure. To try that manually::
- nova boot --flavor 2 --image functest-vping --nic net-id=<NET_ID> nova-test
+ nova boot --flavor m1.small --image functest-vping --nic net-id=<NET_ID> nova-test
This will spawn a VM using the network created previously manually.
In all the OPNFV tested scenarios from CI, it never has been a problem with the
diff --git a/testcases/OpenStack/healthcheck/healthcheck.sh b/testcases/OpenStack/healthcheck/healthcheck.sh
index 899f96b59..d9a83a2af 100755
--- a/testcases/OpenStack/healthcheck/healthcheck.sh
+++ b/testcases/OpenStack/healthcheck/healthcheck.sh
@@ -187,13 +187,13 @@ info "Testing Nova API..."
# by SDN controller in case of odl_l2 scenario.
sleep 60
-nova boot --flavor 2 --image ${image_1} --nic net-id=${net1_id} ${instance_1}
+nova boot --flavor m1.small --image ${image_1} --nic net-id=${net1_id} ${instance_1}
debug "nova instance '${instance_1}' booted on ${net_1}."
-nova boot --flavor 2 --image ${image_1} --nic net-id=${net1_id} ${instance_2}
+nova boot --flavor m1.small --image ${image_1} --nic net-id=${net1_id} ${instance_2}
debug "nova instance '${instance_2}' booted on ${net_1}."
-nova boot --flavor 2 --image ${image_2} --nic net-id=${net2_id} ${instance_3}
+nova boot --flavor m1.small --image ${image_2} --nic net-id=${net2_id} ${instance_3}
debug "nova instance '${instance_3}' booted on ${net_2}."
-nova boot --flavor 2 --image ${image_2} --nic net-id=${net2_id} ${instance_4}
+nova boot --flavor m1.small --image ${image_2} --nic net-id=${net2_id} ${instance_4}
debug "nova instance '${instance_4}' booted on ${net_2}."
vm1_id=$(nova list | grep ${instance_1} | awk '{print $2}')