diff options
| -rw-r--r-- | docs/apidocs/.keep | 0 | ||||
| -rw-r--r-- | docs/userguide/index.rst | 6 | ||||
| -rw-r--r-- | docs/userguide/introduction.rst | 14 | ||||
| -rw-r--r-- | func/spawn_vm.py | 2 |
4 files changed, 10 insertions, 12 deletions
diff --git a/docs/apidocs/.keep b/docs/apidocs/.keep deleted file mode 100644 index e69de29b..00000000 --- a/docs/apidocs/.keep +++ /dev/null diff --git a/docs/userguide/index.rst b/docs/userguide/index.rst index fe24293a..202bf66e 100644 --- a/docs/userguide/index.rst +++ b/docs/userguide/index.rst @@ -16,6 +16,6 @@ Colorado 1.0 ./overview.rst ./introduction.rst - ./01-compute_testcases.rst - ./02-network_testcases.rst - ./03-storage_testcases.rst + ./01-compute.rst + ./02-network.rst + ./03-storage.rst diff --git a/docs/userguide/introduction.rst b/docs/userguide/introduction.rst index 823a2722..b874ea46 100644 --- a/docs/userguide/introduction.rst +++ b/docs/userguide/introduction.rst @@ -23,12 +23,12 @@ The QTIP directory has been sectioned off into multiple folders to facilitate **test_cases/:** This folder is used to store all the config files which are used to setup the - environment prior to a test. This folder is further divided into opnfv pods - which run QTIP. Inside each pod there are folders which contain the config - files segmented based on test cases. Namely, these include, `Compute`, - `Network` and `Storage`. The default folder is there for the end user who - is interested in testing their infrastructure which is installed by fuel -or compass but aren't part of a opnfv pod,and for opnfv CI. +environment prior to a test. This folder is further divided into opnfv pods +which run QTIP. Inside each pod there are folders which contain the config files +segmented based on test cases. Namely, these include, `Compute`, `Network` and +`Storage`. The default folder is there for the end user who is interested in +testing their infrastructure which is installed by fuel or compass but aren't +part of a opnfv pod,and for opnfv CI. The structure of the directory for the user appears as follows :: @@ -338,14 +338,12 @@ Running QTIP on the using 'default' as the pod name and for the 'compute' suite :: curl --trace-ascii debug.txt -X POST -d '{ "installer_ip": "10.20.6.2","installer_type":"fuel", "suite_name":"compute", "type": "BM"}' -H "Content-Type: application/json" http://qtip_server_ip:5000/api/v1.0/jobs - Running QTIP on the using 'default' as the pod name and for the 'compute' suite 'vm' type by restful api :: curl --trace-ascii debug.txt -X POST -d '{ "installer_ip": "10.20.6.2","installer_type":"fuel", "suite_name":"compute", "type": "VM"}' -H "Content-Type: application/json" http://qtip_server_ip:5000/api/v1.0/jobs - Running QTIP on the using `default` as the pod name and for the `network` suite by cli :: diff --git a/func/spawn_vm.py b/func/spawn_vm.py index 7ac4340e..b467ab1f 100644 --- a/func/spawn_vm.py +++ b/func/spawn_vm.py @@ -69,7 +69,7 @@ class SpawnVM(Env_setup): mark = exc.problem_mark
print 'Error in qtip/heat/SampleHeat.yaml at: (%s,%s)' % (mark.line + 1, mark.column + 1)
print 'EXITING PROGRAM. Correct File and restart'
- sys.exit(0)
+ sys.exit(1)
fopen = open('./data/QtipKey.pub', 'r')
fopenstr = fopen.read()
fopenstr = fopenstr.rstrip()
|