aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorHarry Huang <huangxiangyu5@huawei.com>2017-02-15 11:50:55 +0800
committerHarry Huang <huangxiangyu5@huawei.com>2017-02-15 11:50:55 +0800
commit31abe8bc59d5ce2eed2269f12703ce575d2560db (patch)
tree1a5b8eb74bb4645c25e1493777a413deddc12f57 /conf
parent68f25c4b7147de79126c1cd8565cac1423967e45 (diff)
Add Open-O docker tag
1. support designate open-o image tag in conf/openo-vm.yml 2. add ubuntu image 12.04 Change-Id: If96a482eb12bc37799885bc290581257fe0c6817 Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/download.conf3
-rw-r--r--conf/openo-vm.yml1
2 files changed, 3 insertions, 1 deletions
diff --git a/conf/download.conf b/conf/download.conf
index 1012601..4c2d70d 100644
--- a/conf/download.conf
+++ b/conf/download.conf
@@ -2,4 +2,5 @@
OPENO_VM_ISO_URL=http://205.177.226.237:9999/CentOS-7-x86_64-Minimal-1511.iso
JUJU_IMG_NAME=(xenial_x86_64 trusty_x86_x64)
JUJU_IMG_URL=(http://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img \
- http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img)
+ http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img \
+ http://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-amd64-disk1.img)
diff --git a/conf/openo-vm.yml b/conf/openo-vm.yml
index 0ce2152..25badad 100644
--- a/conf/openo-vm.yml
+++ b/conf/openo-vm.yml
@@ -8,6 +8,7 @@
##############################################################################
---
openo:
+ tag: 1.0.0
cpu: 4
memory: 64
disk: 100