diff options
| author |   chenshuai@huawei.com <chenshuai@huawei.com> | 2016-07-14 06:16:22 -0400 |
|---|---|---|
| committer | chenshuai@huawei.com <chenshuai@huawei.com> | 2016-07-14 06:42:33 -0400 |
| commit | 1dde11d3b422f1c649244078c2b2ef945b0a0e2c (patch) | |
| tree | d187c94efd52ebc3424eb3fc42c9aaaa36fa3281 /build | |
| parent | a120380019a226fea98588256c6e5df02b3b352a (diff) | |
Support Ubuntu 14.04 and Ubuntu 16.04 in one ISO
JIRA: COMPASS-431
Change-Id: I3134b558835081e04d29a666f5d3d79486b2c7a9
Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.conf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/build/build.conf b/build/build.conf index 138a2420..c6e0f7a1 100644 --- a/build/build.conf +++ b/build/build.conf @@ -18,7 +18,8 @@ export ANSIBLE_MODULE=${ANSIBLE_MODULE:-https://github.com/openstack-ansible/ope # OS ISO for provisioning export CENTOS_ISO=${CENTOS_ISO:-$PACKAGE_URL/CentOS-7-x86_64-Minimal-1511.iso} -export UBUNTU_ISO=${UBUNTU_ISO:-$PACKAGE_URL/ubuntu-14.04.3-server-amd64.iso} +export UBUNTU_ISO=${UBUNTU_ISO:-$PACKAGE_URL/ubuntu-16.04-server-amd64.iso} # ubuntu 16.04 +export UBUNTU_ISO1=${UBUNTU_ISO1:-$PACKAGE_URL/ubuntu-14.04.3-server-amd64.iso} # ubuntu 14.04 # OpenStack Packages for deployment #export TRUSTY_JUNO_PPA=${TRUSTY_JUNO_PPA:-$PACKAGE_URL/trusty-juno-ppa.tar.gz} |