summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-01-14 11:25:49 +0100
committervarac <varacanero@zeromail.org>2016-01-14 11:25:49 +0100
commit641154a55757c56893a3ae15d95b9ecaf3342675 (patch)
treed6cdae225222aca1b8999ef655be54b91af12513
parenta18bf0fc8c1330b68e79f5a1f0982cbf80783046 (diff)
remove vmware
-rw-r--r--scripts/vmware.sh21
-rw-r--r--template.json43
2 files changed, 1 insertions, 63 deletions
diff --git a/scripts/vmware.sh b/scripts/vmware.sh
deleted file mode 100644
index b77ff2e..0000000
--- a/scripts/vmware.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-# Bail if we are not running inside VMWare.
-if [[ `facter virtual` != "vmware" ]]; then
- exit 0
-fi
-
-# Install the VMWare Tools from a linux ISO.
-
-#wget http://192.168.0.185/linux.iso -P /tmp
-mkdir -p /mnt/vmware
-mount -o loop /home/vagrant/linux.iso /mnt/vmware
-
-cd /tmp
-tar xzf /mnt/vmware/VMwareTools-*.tar.gz
-
-umount /mnt/vmware
-rm -fr /home/vagrant/linux.iso
-
-/tmp/vmware-tools-distrib/vmware-install.pl -d
-rm -fr /tmp/vmware-tools-distrib
diff --git a/template.json b/template.json
index ec5067e..d06a3ef 100644
--- a/template.json
+++ b/template.json
@@ -13,7 +13,6 @@
"scripts": [
"scripts/base.sh",
"scripts/virtualbox.sh",
- "scripts/vmware.sh",
"scripts/vagrant.sh",
"scripts/dep.sh",
"scripts/cleanup.sh",
@@ -22,9 +21,6 @@
"override": {
"virtualbox-iso": {
"execute_command": "echo 'vagrant'|sudo -S bash '{{.Path}}'"
- },
- "vmware-iso": {
- "execute_command": "echo 'vagrant'|sudo -S bash '{{.Path}}'"
}
}
}
@@ -56,34 +52,7 @@
"shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S bash 'shutdown.sh'",
"guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
"virtualbox_version_file": ".vbox_version"
- },
- {
- "type": "vmware-iso",
- "boot_command": [
- "<esc><esc><enter><wait>",
- "/install/vmlinuz noapic preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg ",
- "debian-installer=en_US auto locale=en_US kbd-chooser/method=us ",
- "hostname={{ .Name }} ",
- "fb=false debconf/frontend=noninteractive ",
- "keyboard-configuration/modelcode=SKIP keyboard-configuration/layout=USA keyboard-configuration/variant=USA console-setup/ask_detect=false ",
- "initrd=/install/initrd.gz -- <enter>"
- ],
- "boot_wait": "10s",
- "disk_size": 20480,
- "guest_os_type": "Ubuntu-64",
- "headless": true,
- "http_directory": "http",
- "iso_checksum": "af224223de99e2a730b67d7785b657f549be0d63221188e105445f75fb8305c9",
- "iso_checksum_type": "sha256",
- "iso_url": "http://releases.ubuntu.com/precise/ubuntu-12.04.5-server-amd64.iso",
- "skip_compaction": true,
- "ssh_username": "vagrant",
- "ssh_password": "vagrant",
- "ssh_port": 22,
- "ssh_wait_timeout": "10000s",
- "shutdown_command": "echo '/sbin/halt -h -p' > shutdown.sh; echo 'vagrant'|sudo -S bash 'shutdown.sh'",
- "tools_upload_flavor": "linux"
- }
+ }
],
"post-processors": [
[{
@@ -92,16 +61,6 @@
},
{
"type": "atlas",
- "only": ["vmware-iso"],
- "artifact": "{{user `atlas_username`}}/{{user `atlas_name`}}",
- "artifact_type": "vagrant.box",
- "metadata": {
- "provider": "vmware_desktop",
- "version": "0.0.1"
- }
- },
- {
- "type": "atlas",
"only": ["virtualbox-iso"],
"artifact": "{{user `atlas_username`}}/{{user `atlas_name`}}",
"artifact_type": "vagrant.box",