summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Rosenboom <j.rosenboom@x-ion.de>2015-03-23 11:45:00 +0100
committerMatt Riedemann <mriedem@us.ibm.com>2015-09-11 10:14:39 -0700
commit6f91538d1dce400e7fe14528a62682e4555be514 (patch)
tree2c4df98150cf086ec8c97f9c57f244cdb30e3ee9
parentde6f9c2c4a4a2cf06775caf4c2ce74b1708ca3df (diff)
Update default cirros versionjuno-eol
Update the default CIRROS_VERSION to 0.3.4, which has better support for IPv6 and some other bugfixes. Co-Authored-By: Scott Moser <smoser@ubuntu.com> Change-Id: I03ee6e1403680fb6c421225a7cadaf8a82edf702 Depends-On: Iac9f108d947ff4a51f99c6e8ad9d1ac5b32c000a (cherry picked from commit 9fd75f57fd8bdbd1926b1942462d439f9e496204) (cherry picked from commit 89c0cd7442894711ea8c6094e87473fee585eff5)
Notes
Notes (review): Verified+2: Jenkins Code-Review+2: Matthew Treinish <mtreinish@kortar.org> Code-Review+2: Ian Wienand <iwienand@redhat.com> Workflow+1: Ian Wienand <iwienand@redhat.com> Code-Review+1: Hirofumi Ichihara <ichihara.hirofumi@lab.ntt.co.jp> Code-Review+1: venkatamahesh <venkatamaheshkotha@gmail.com> Submitted-by: Jenkins Submitted-at: Mon, 14 Sep 2015 05:07:54 +0000 Reviewed-on: https://review.openstack.org/222713 Project: openstack-dev/devstack Branch: refs/heads/stable/juno
-rw-r--r--stackrc2
-rw-r--r--tools/xen/README.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/stackrc b/stackrc
index d9d7547..8ef1ff2 100644
--- a/stackrc
+++ b/stackrc
@@ -475,7 +475,7 @@ esac
475#IMAGE_URLS="http://smoser.brickies.net/ubuntu/ttylinux-uec/ttylinux-uec-amd64-11.2_2.6.35-15_1.tar.gz" # old ttylinux-uec image 475#IMAGE_URLS="http://smoser.brickies.net/ubuntu/ttylinux-uec/ttylinux-uec-amd64-11.2_2.6.35-15_1.tar.gz" # old ttylinux-uec image
476#IMAGE_URLS="http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img" # cirros full disk image 476#IMAGE_URLS="http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img" # cirros full disk image
477 477
478CIRROS_VERSION=${CIRROS_VERSION:-"0.3.2"} 478CIRROS_VERSION=${CIRROS_VERSION:-"0.3.4"}
479CIRROS_ARCH=${CIRROS_ARCH:-"x86_64"} 479CIRROS_ARCH=${CIRROS_ARCH:-"x86_64"}
480 480
481# Set default image based on ``VIRT_DRIVER`` and ``LIBVIRT_TYPE``, either of 481# Set default image based on ``VIRT_DRIVER`` and ``LIBVIRT_TYPE``, either of
diff --git a/tools/xen/README.md b/tools/xen/README.md
index c8f47be..61694e9 100644
--- a/tools/xen/README.md
+++ b/tools/xen/README.md
@@ -97,7 +97,7 @@ Of course, use real passwords if this machine is exposed.
97 # Download a vhd and a uec image 97 # Download a vhd and a uec image
98 IMAGE_URLS="\ 98 IMAGE_URLS="\
99 https://github.com/downloads/citrix-openstack/warehouse/cirros-0.3.0-x86_64-disk.vhd.tgz,\ 99 https://github.com/downloads/citrix-openstack/warehouse/cirros-0.3.0-x86_64-disk.vhd.tgz,\
100 http://download.cirros-cloud.net/0.3.2/cirros-0.3.2-x86_64-uec.tar.gz" 100 http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-uec.tar.gz"
101 101
102 # Explicitly set virt driver 102 # Explicitly set virt driver
103 VIRT_DRIVER=xenserver 103 VIRT_DRIVER=xenserver