Code Review
/
functest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "More support of snaps for VNF"
[functest.git]
/
functest
/
opnfv_tests
/
vnf
/
ims
/
orchestra.yaml
diff --git
a/functest/opnfv_tests/vnf/ims/orchestra.yaml
b/functest/opnfv_tests/vnf/ims/orchestra.yaml
index
7b43c00
..
4cd18e7
100644
(file)
--- a/
functest/opnfv_tests/vnf/ims/orchestra.yaml
+++ b/
functest/opnfv_tests/vnf/ims/orchestra.yaml
@@
-1,10
+1,10
@@
tenant_images:
orchestrator:
tenant_images:
orchestrator:
- ubuntu-14.04-server-cloudimg-amd64-disk1:
http://cloud-images.ubuntu.com/trusty/current
/trusty-server-cloudimg-amd64-disk1.img
+ ubuntu-14.04-server-cloudimg-amd64-disk1:
/home/opnfv/functest/images
/trusty-server-cloudimg-amd64-disk1.img
orchestra_openims:
orchestra_openims:
- openims:
http://marketplace.openbaton.org:8082/api/v1/images/52e2ccc0-1dce-4663-894d-28aab49323aa
/img
+ openims:
/home/opnfv/functest/images
/img
orchestra_clearwaterims:
orchestra_clearwaterims:
- ubuntu-14.04-server-cloudimg-amd64-disk1:
http://cloud-images.ubuntu.com/trusty/current
/trusty-server-cloudimg-amd64-disk1.img
+ ubuntu-14.04-server-cloudimg-amd64-disk1:
/home/opnfv/functest/images
/trusty-server-cloudimg-amd64-disk1.img
mano:
name: OpenBaton
version: '3.2.0'
mano:
name: OpenBaton
version: '3.2.0'
@@
-58,4
+58,4
@@
orchestra_clearwaterims:
ram_min: 2048
disk: 5
vcpus: 2
ram_min: 2048
disk: 5
vcpus: 2
- test:
\ No newline at end of file
+ test: