Browse code

XenAPI: Upgrade built-VM to Trusty

If you're not using an XVA then the built-VM was previously Saucy, which is
not supported by openstack any more.

Change-Id: I1040d9e43d517582e76f2e1df787986b5ffbc42c

Bob Ball authored on 2014/09/29 20:53:02
Showing 2 changed files
... ...
@@ -297,9 +297,9 @@ d-i user-setup/encrypt-home boolean false
297 297
 ### Apt setup
298 298
 # You can choose to install restricted and universe software, or to install
299 299
 # software from the backports repository.
300
-#d-i apt-setup/restricted boolean true
301
-#d-i apt-setup/universe boolean true
302
-#d-i apt-setup/backports boolean true
300
+d-i apt-setup/restricted boolean true
301
+d-i apt-setup/universe boolean true
302
+d-i apt-setup/backports boolean true
303 303
 # Uncomment this if you don't want to use a network mirror.
304 304
 #d-i apt-setup/use_mirror boolean false
305 305
 # Select which update services to use; define the mirrors to be used.
... ...
@@ -366,7 +366,7 @@ d-i pkgsel/updatedb boolean false
366 366
 # With a few exceptions for unusual partitioning setups, GRUB 2 is now the
367 367
 # default. If you need GRUB Legacy for some particular reason, then
368 368
 # uncomment this:
369
-#d-i grub-installer/grub2_instead_of_grub_legacy boolean false
369
+d-i grub-installer/grub2_instead_of_grub_legacy boolean false
370 370
 
371 371
 # This is fairly safe to set, it makes grub install automatically to the MBR
372 372
 # if no other operating system is detected on the machine.
... ...
@@ -63,15 +63,15 @@ PUB_IP=${PUB_IP:-172.24.4.10}
63 63
 PUB_NETMASK=${PUB_NETMASK:-255.255.255.0}
64 64
 
65 65
 # Ubuntu install settings
66
-UBUNTU_INST_RELEASE="saucy"
67
-UBUNTU_INST_TEMPLATE_NAME="Ubuntu 13.10 (64-bit) for DevStack"
66
+UBUNTU_INST_RELEASE="trusty"
67
+UBUNTU_INST_TEMPLATE_NAME="Ubuntu 14.04 (64-bit) for DevStack"
68 68
 # For 12.04 use "precise" and update template name
69 69
 # However, for 12.04, you should be using
70 70
 # XenServer 6.1 and later or XCP 1.6 or later
71 71
 # 11.10 is only really supported with XenServer 6.0.2 and later
72 72
 UBUNTU_INST_ARCH="amd64"
73
-UBUNTU_INST_HTTP_HOSTNAME="archive.ubuntu.net"
74
-UBUNTU_INST_HTTP_DIRECTORY="/ubuntu"
73
+UBUNTU_INST_HTTP_HOSTNAME="mirror.anl.gov"
74
+UBUNTU_INST_HTTP_DIRECTORY="/pub/ubuntu"
75 75
 UBUNTU_INST_HTTP_PROXY=""
76 76
 UBUNTU_INST_LOCALE="en_US"
77 77
 UBUNTU_INST_KEYBOARD="us"