[mapguide-commits] r9236 - in trunk/Tools/Vagrant/packer: . http scripts scripts/centos

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Tue Sep 19 05:28:00 PDT 2017 

Author: jng
Date: 2017-09-19 05:28:00 -0700 (Tue, 19 Sep 2017)
New Revision: 9236

Added:
   trunk/Tools/Vagrant/packer/http/centos6/
   trunk/Tools/Vagrant/packer/http/ubuntu12/
   trunk/Tools/Vagrant/packer/http/ubuntu14/
   trunk/Tools/Vagrant/packer/scripts/centos6/
Removed:
   trunk/Tools/Vagrant/packer/http/centos-6.5/
   trunk/Tools/Vagrant/packer/http/ubuntu-12.04.5/
   trunk/Tools/Vagrant/packer/http/ubuntu-14.04.4/
   trunk/Tools/Vagrant/packer/scripts/centos-6.5/
Modified:
   trunk/Tools/Vagrant/packer/centos6-amd64.json
   trunk/Tools/Vagrant/packer/centos6-i386.json
   trunk/Tools/Vagrant/packer/scripts/centos/virtualbox.sh
   trunk/Tools/Vagrant/packer/ubuntu12-amd64.json
   trunk/Tools/Vagrant/packer/ubuntu12-i386.json
   trunk/Tools/Vagrant/packer/ubuntu14-amd64.json
   trunk/Tools/Vagrant/packer/ubuntu14-i386.json
Log:
Update packer configs to:
 - Use CentOS 6.9 as the base centos6 image
   - Fix virtualbox.sh to work against this version
 - Rename script and preseed folders to only state major distro version (eg. centos-6.5 -> centos6)
   - Apply same naming to packer-generated VMs and output directories

Modified: trunk/Tools/Vagrant/packer/centos6-amd64.json
===================================================================
--- trunk/Tools/Vagrant/packer/centos6-amd64.json	2017-09-12 15:24:12 UTC (rev 9235)
+++ trunk/Tools/Vagrant/packer/centos6-amd64.json	2017-09-19 12:28:00 UTC (rev 9236)
@@ -2,11 +2,11 @@
   "builders": [{
     "type": "virtualbox-iso",
     "guest_os_type": "RedHat_64",
-    "iso_url": "{{user `mirror`}}/6.5/isos/x86_64/CentOS-6.5-x86_64-minimal.iso",
-    "iso_checksum": "0d9dc37b5dd4befa1c440d2174e88a87",
+    "iso_url": "{{user `mirror`}}/6.9/isos/x86_64/CentOS-6.9-x86_64-minimal.iso",
+    "iso_checksum": "af4a1640c0c6f348c6c41f1ea9e192a2",
     "iso_checksum_type": "md5",
-    "output_directory": "output-centos-6.5-x86_64",
-    "vm_name": "packer-centos-6.5-x86_64",
+    "output_directory": "output-centos6-x86_64",
+    "vm_name": "packer-centos6-x86_64",
     "disk_size": "{{user `disk_size`}}",
     "headless": "{{user `headless`}}",
     "http_directory": "http",
@@ -14,7 +14,7 @@
     "boot_command": [
       "<esc>",
       "<wait>",
-      "linux ks=http://{{.HTTPIP}}:{{.HTTPPort}}/centos-6.5/anaconda-ks.cfg",
+      "linux ks=http://{{.HTTPIP}}:{{.HTTPPort}}/centos6/anaconda-ks.cfg",
       "<enter>"
     ],
     "ssh_wait_timeout": "60m",
@@ -29,12 +29,12 @@
   "provisioners": [{
     "type": "shell",
     "scripts": [
-      "scripts/centos-6.5/base.sh",
+      "scripts/centos6/base.sh",
       "scripts/centos/virtualbox.sh",
       "scripts/common/vagrant.sh",
       "scripts/common/sshd.sh",
       "scripts/mapguide/centos64.sh",
-      "scripts/centos-6.5/cleanup.sh",
+      "scripts/centos6/cleanup.sh",
       "scripts/common/minimize.sh"
     ]
   }],

Modified: trunk/Tools/Vagrant/packer/centos6-i386.json
===================================================================
--- trunk/Tools/Vagrant/packer/centos6-i386.json	2017-09-12 15:24:12 UTC (rev 9235)
+++ trunk/Tools/Vagrant/packer/centos6-i386.json	2017-09-19 12:28:00 UTC (rev 9236)
@@ -2,11 +2,11 @@
   "builders": [{
     "type": "virtualbox-iso",
     "guest_os_type": "RedHat",
-    "iso_url": "{{user `mirror`}}/6.5/isos/i386/CentOS-6.5-i386-minimal.iso",
-    "iso_checksum": "a4f27ab51d0d2c9d36b68c56b39f752b",
+    "iso_url": "{{user `mirror`}}/6.9/isos/i386/CentOS-6.9-i386-minimal.iso",
+    "iso_checksum": "e7a524a293346f759d2ae33d7161e51e",
     "iso_checksum_type": "md5",
-    "output_directory": "output-centos-6.5-i386",
-    "vm_name": "packer-centos-6.5-i386",
+    "output_directory": "output-centos6-i386",
+    "vm_name": "packer-centos6-i386",
     "disk_size": "{{user `disk_size`}}",
     "headless": "{{user `headless`}}",
     "http_directory": "http",
@@ -14,7 +14,7 @@
     "boot_command": [
       "<esc>",
       "<wait>",
-      "linux ks=http://{{.HTTPIP}}:{{.HTTPPort}}/centos-6.5/anaconda-ks.cfg",
+      "linux ks=http://{{.HTTPIP}}:{{.HTTPPort}}/centos6/anaconda-ks.cfg",
       "<enter>"
     ],
     "ssh_wait_timeout": "60m",
@@ -29,12 +29,12 @@
   "provisioners": [{
     "type": "shell",
     "scripts": [
-      "scripts/centos-6.5/base.sh",
+      "scripts/centos6/base.sh",
       "scripts/centos/virtualbox.sh",
       "scripts/common/vagrant.sh",
       "scripts/common/sshd.sh",
       "scripts/mapguide/centos32.sh",
-      "scripts/centos-6.5/cleanup.sh",
+      "scripts/centos6/cleanup.sh",
       "scripts/common/minimize.sh"
     ]
   }],

Modified: trunk/Tools/Vagrant/packer/scripts/centos/virtualbox.sh
===================================================================
--- trunk/Tools/Vagrant/packer/scripts/centos/virtualbox.sh	2017-09-12 15:24:12 UTC (rev 9235)
+++ trunk/Tools/Vagrant/packer/scripts/centos/virtualbox.sh	2017-09-19 12:28:00 UTC (rev 9236)
@@ -3,14 +3,27 @@
 set -e
 set -x
 
+if [ "$PACKER_BUILDER_TYPE" != "virtualbox-iso" ]; then
+  exit 0
+fi
+
+sudo yum -y install bzip2
 sudo yum -y --enablerepo=epel install dkms
+sudo yum -y install kernel-devel
 sudo yum -y install make
 sudo yum -y install perl
 
 # Uncomment this if you want to install Guest Additions with support for X
 #sudo yum -y install xorg-x11-server-Xorg
 
-sudo mount -o loop ~/VBoxGuestAdditions.iso /mnt/
+# In CentOS 6 or earlier, dkms package provides SysV init script called
+# dkms_autoinstaller that is enabled by default
+if systemctl list-unit-files | grep -q dkms.service; then
+  sudo systemctl start dkms
+  sudo systemctl enable dkms
+fi
+
+sudo mount -o loop,ro ~/VBoxGuestAdditions.iso /mnt/
 sudo /mnt/VBoxLinuxAdditions.run || :
 sudo umount /mnt/
-rm -f ~/VBoxGuestAdditions.iso
+rm -f ~/VBoxGuestAdditions.iso
\ No newline at end of file

Modified: trunk/Tools/Vagrant/packer/ubuntu12-amd64.json
===================================================================
--- trunk/Tools/Vagrant/packer/ubuntu12-amd64.json	2017-09-12 15:24:12 UTC (rev 9235)
+++ trunk/Tools/Vagrant/packer/ubuntu12-amd64.json	2017-09-19 12:28:00 UTC (rev 9236)
@@ -5,8 +5,8 @@
     "iso_url": "http://mirror.internode.on.net.au/pub/ubuntu/releases/12.04/ubuntu-12.04.5-server-amd64.iso",
     "iso_checksum": "769474248a3897f4865817446f9a4a53",
     "iso_checksum_type": "md5",
-    "output_directory": "output-ubuntu-12.04.5-amd64",
-    "vm_name": "packer-ubuntu-12.04.5-amd64",
+    "output_directory": "output-ubuntu12-amd64",
+    "vm_name": "packer-ubuntu12-amd64",
     "disk_size": "{{user `disk_size`}}",
     "headless": "{{user `headless`}}",
     "http_directory": "http",
@@ -18,7 +18,7 @@
       "install ",
       "auto-install/enable=true ",
       "debconf/priority=critical ",
-      "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu-12.04.5/preseed.cfg ",
+      "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu12/preseed.cfg ",
       "<enter>"
     ],
     "ssh_wait_timeout": "60m",

Modified: trunk/Tools/Vagrant/packer/ubuntu12-i386.json
===================================================================
--- trunk/Tools/Vagrant/packer/ubuntu12-i386.json	2017-09-12 15:24:12 UTC (rev 9235)
+++ trunk/Tools/Vagrant/packer/ubuntu12-i386.json	2017-09-19 12:28:00 UTC (rev 9236)
@@ -5,8 +5,8 @@
     "iso_url": "http://mirror.internode.on.net.au/pub/ubuntu/releases/12.04/ubuntu-12.04.5-server-i386.iso",
     "iso_checksum": "1214cd22448338b60bb24f583dd8741a",
     "iso_checksum_type": "md5",
-    "output_directory": "output-ubuntu-12.04.5-i386",
-    "vm_name": "packer-ubuntu-12.04.5-i386",
+    "output_directory": "output-ubuntu12-i386",
+    "vm_name": "packer-ubuntu12-i386",
     "disk_size": "{{user `disk_size`}}",
     "headless": "{{user `headless`}}",
     "http_directory": "http",
@@ -18,7 +18,7 @@
       "install ",
       "auto-install/enable=true ",
       "debconf/priority=critical ",
-      "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu-12.04.5/preseed.cfg ",
+      "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu12/preseed.cfg ",
       "<enter>"
     ],
     "ssh_wait_timeout": "60m",

Modified: trunk/Tools/Vagrant/packer/ubuntu14-amd64.json
===================================================================
--- trunk/Tools/Vagrant/packer/ubuntu14-amd64.json	2017-09-12 15:24:12 UTC (rev 9235)
+++ trunk/Tools/Vagrant/packer/ubuntu14-amd64.json	2017-09-19 12:28:00 UTC (rev 9236)
@@ -5,8 +5,8 @@
     "iso_url": "http://mirror.internode.on.net.au/pub/ubuntu/releases/14.04/ubuntu-14.04.4-server-amd64.iso",
     "iso_checksum": "2ac1f3e0de626e54d05065d6f549fa3a",
     "iso_checksum_type": "md5",
-    "output_directory": "output-ubuntu-14.04.4-amd64",
-    "vm_name": "packer-ubuntu-14.04.4-amd64",
+    "output_directory": "output-ubuntu14-amd64",
+    "vm_name": "packer-ubuntu14-amd64",
     "disk_size": "{{user `disk_size`}}",
     "headless": "{{user `headless`}}",
     "http_directory": "http",
@@ -20,7 +20,7 @@
       "biosdevname=0 ",
       "auto-install/enable=true ",
       "debconf/priority=critical ",
-      "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu-14.04.4/preseed.cfg ",
+      "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu14/preseed.cfg ",
       "<enter>"
     ],
     "ssh_wait_timeout": "60m",

Modified: trunk/Tools/Vagrant/packer/ubuntu14-i386.json
===================================================================
--- trunk/Tools/Vagrant/packer/ubuntu14-i386.json	2017-09-12 15:24:12 UTC (rev 9235)
+++ trunk/Tools/Vagrant/packer/ubuntu14-i386.json	2017-09-19 12:28:00 UTC (rev 9236)
@@ -20,7 +20,7 @@
       "biosdevname=0 ",
       "auto-install/enable=true ",
       "debconf/priority=critical ",
-      "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu-14.04.4/preseed.cfg ",
+      "preseed/url=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu14/preseed.cfg ",
       "<enter>"
     ],
     "ssh_wait_timeout": "60m",

More information about the mapguide-commits mailing list