Commits

Kirill Simonov  committed 09a79f3

Updated VM installation scripts.

  • Participants
  • Parent commits a26d463

Comments (0)

Files changed (8)

File tool/data/vm/centos-ks.cfg

 timezone --utc America/New_York
 
 # Initialize disk partitions.
-clearpart --initlabel
+zerombr
+clearpart --all --initlabel
 
 # Install the boot loader.
 bootloader --location=mbr --driveorder=sda --append="crashkernel=auto rhgb quiet"

File tool/data/vm/oracle10g-update.sh

 ## Update the hostname.
 #echo oracle10g-vm >/etc/hostname
 
+# Enable HTTPS for APT repositories.
+apt-get -q update
+apt-get -qy install apt-transport-https
+
 # Register the Oracle repository.
-echo "deb http://oss.oracle.com/debian/ unstable main non-free" >/etc/apt/sources.list.d/oracle.list
-wget -q http://oss.oracle.com/el4/RPM-GPG-KEY-oracle -O- | apt-key add -
+echo "deb https://oss.oracle.com/debian/ unstable main non-free" >/etc/apt/sources.list.d/oracle.list
+wget -q https://oss.oracle.com/el4/RPM-GPG-KEY-oracle -O- | apt-key add -
 apt-get -q update
 
 # Install the Oracle 10g Express Edition.

File tool/data/vm/py26-update.sh

 # Update the hostname.
 echo py26-vm >/etc/hostname
 
+# Enable HTTPS for APT repositories.
+apt-get -q update
+apt-get -qy install apt-transport-https
+
 # Register the Oracle repository.
-echo "deb http://oss.oracle.com/debian/ unstable main non-free" >/etc/apt/sources.list.d/oracle.list
-wget -q http://oss.oracle.com/el4/RPM-GPG-KEY-oracle -O- | apt-key add -
+echo "deb https://oss.oracle.com/debian/ unstable main non-free" >/etc/apt/sources.list.d/oracle.list
+wget -q https://oss.oracle.com/el4/RPM-GPG-KEY-oracle -O- | apt-key add -
 apt-get -q update
 
 # Install Mercurial.
 # Initialize Python virtual enviroment in `/root`.
 virtualenv -p python2.6 .
 
+# Upgrade setuptools.
+~/bin/pip -q install --upgrade distribute
+
 # Install Django and SQLAlchemy.
 ~/bin/pip -q install Django
 ~/bin/pip -q install SQLAlchemy

File tool/data/vm/py27-update.sh

 # Update the hostname.
 echo py27-vm >/etc/hostname
 
+# Enable HTTPS for APT repositories.
+apt-get -q update
+apt-get -qy install apt-transport-https
+
 # Register the testing repository.
 echo "deb http://ftp.us.debian.org/debian/ wheezy main" >/etc/apt/sources.list.d/testing.list
 cat <<END >>/etc/apt/preferences.d/pinning.pref
 apt-get -q update
 
 # Register the Oracle repository.
-echo "deb http://oss.oracle.com/debian/ unstable main non-free" >/etc/apt/sources.list.d/oracle.list
-wget -q http://oss.oracle.com/el4/RPM-GPG-KEY-oracle -O- | apt-key add -
+echo "deb https://oss.oracle.com/debian/ unstable main non-free" >/etc/apt/sources.list.d/oracle.list
+wget -q https://oss.oracle.com/el4/RPM-GPG-KEY-oracle -O- | apt-key add -
 apt-get -q update
 
 # Install Mercurial.
 # Initialize Python virtual enviroment in `/root`.
 virtualenv -p python2.7 --system-site-packages .
 
+# Upgrade setuptools.
+~/bin/pip -q install --upgrade distribute
+
 # Install Django and SQLAlchemy.
 ~/bin/pip -q install Django
 ~/bin/pip -q install SQLAlchemy

File tool/data/vm/rpm-update.sh

 echo "rpm-vm" >/etc/hostname
 
 # Add EPEL repository.
-rpm -Uvh http://download.fedoraproject.org/pub/epel/6/i386/epel-release-6-5.noarch.rpm
+rpm -Uvh http://download.fedoraproject.org/pub/epel/6/i386/epel-release-6-8.noarch.rpm
 
 # install packages
 yum -q -y install rpmdevtools

File tool/data/vm/ubuntu-lts-install.sh

-ubuntu-install.sh

File tool/data/vm/ubuntu-lts-preseed.cfg

-ubuntu-preseed.cfg
 MEM_SIZE = "512"
 
 DEBIAN_ISO_URLS = [
-    "http://cdimage.debian.org/cdimage/archive/6.0.3/i386/iso-cd/debian-6.0.3-i386-netinst.iso",
-    "http://cdimage.debian.org/cdimage/release/6.0.3/i386/iso-cd/debian-6.0.3-i386-netinst.iso",
+    "http://cdimage.debian.org/cdimage/archive/6.0.6/i386/iso-cd/debian-6.0.6-i386-netinst.iso",
+    "http://cdimage.debian.org/cdimage/release/6.0.6/i386/iso-cd/debian-6.0.6-i386-netinst.iso",
 ]
 
 UBUNTU_ISO_URLS = [
-    "http://releases.ubuntu.com/oneiric/ubuntu-11.10-server-i386.iso",
-]
-
-UBUNTU_LTS_ISO_URLS = [
-    "http://releases.ubuntu.com/precise/ubuntu-12.04-server-i386.iso",
+    "http://releases.ubuntu.com/precise/ubuntu-12.04.1-server-i386.iso",
 ]
 
 CENTOS_ISO_URLS = [
-    "http://mirrors.cmich.edu/centos/6.2/isos/i386/CentOS-6.2-i386-minimal.iso",
+    "http://mirrors.cmich.edu/centos/6.3/isos/i386/CentOS-6.3-i386-minimal.iso",
+    "http://vault.centos.org/6.3/isos/i386/CentOS-6.3-i386-minimal.iso",
 ]
 
 WINDOWS_ISO_FILES = [
 ubuntu_vm = DebianTemplateVM('ubuntu',
                              iso_env="UBUNTU_ISO",
                              iso_urls=UBUNTU_ISO_URLS)
-ubuntu_lts_vm = DebianTemplateVM('ubuntu-lts',
-                                 iso_env="UBUNTU_LTS_ISO",
-                                 iso_urls=UBUNTU_LTS_ISO_URLS)
 
 
 @job