From f53e94a76e404a4b9c768b40c9c7c65894e7773c Mon Sep 17 00:00:00 2001
From: Roger Luethi <rl@patchworkscience.org>
Date: Mon, 28 Jul 2014 11:01:01 +0200
Subject: [PATCH] labs: make Ubuntu 14.04 LTS default

This patch makes Ubuntu 14.04 LTS the default for osbash
basedisks.

Implements: blueprint openstack-training-labs
Change-Id: I76e7f5f47d5f68a1513ac9136902c28fbe173fe8
---
 labs/config/localrc | 4 ++--
 labs/osbash.sh      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/labs/config/localrc b/labs/config/localrc
index ac3eab56..454dcea2 100644
--- a/labs/config/localrc
+++ b/labs/config/localrc
@@ -8,8 +8,8 @@
 # to the Internet, this is not sufficient.
 #VM_PROXY="http://192.168.178.20:3128"
 
-# Options:  ubuntu-12.04.4-server-amd64 (default)
-#           ubuntu-14.04-server-amd64
+# Options:  ubuntu-12.04.4-server-amd64
+#           ubuntu-14.04-server-amd64 (default)
 #           fedora-20-x86_64
 #DISTRO=ubuntu-12.04.4-server-amd64
 #DISTRO=fedora-20-x86_64
diff --git a/labs/osbash.sh b/labs/osbash.sh
index 727b03f4..84552626 100755
--- a/labs/osbash.sh
+++ b/labs/osbash.sh
@@ -8,7 +8,7 @@ trap 'kill -- -$$' SIGINT
 
 TOP_DIR=$(cd $(dirname "$0") && pwd)
 
-: ${DISTRO:=ubuntu-12.04.4-server-amd64}
+: ${DISTRO:=ubuntu-14.04-server-amd64}
 
 source "$TOP_DIR/config/localrc"
 source "$TOP_DIR/config/paths"