Skip to content

Commit

Permalink
Close out vmware builds (mostly)
Browse files Browse the repository at this point in the history
  • Loading branch information
cammoraton committed Oct 21, 2014
1 parent f40a776 commit 5af1b1c
Show file tree
Hide file tree
Showing 7 changed files with 198 additions and 3 deletions.
3 changes: 3 additions & 0 deletions centos-6.5.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,9 @@
"override": {
"virtualbox": {
"output": "pug-{{user `hostname`}}-{{user `arch`}}-virtualbox.box"
},
"vmware": {
"output": "pug-{{user `hostname`}}-{{user `arch`}}-vmware.box"
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions centos-7.0.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,9 @@
"override": {
"virtualbox": {
"output": "pug-{{user `hostname`}}-{{user `arch`}}-virtualbox.box"
},
"vmware": {
"output": "pug-{{user `hostname`}}-{{user `arch`}}-vmware.box"
}
}
}
Expand Down
67 changes: 66 additions & 1 deletion precise.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,54 @@
[ "modifyvm", "{{.Name}}", "--memory", "{{user `memory`}}" ],
[ "modifyvm", "{{.Name}}", "--cpus", "{{user `cpus`}}" ]
]
},
{
"type": "vmware-iso",
"guest_os_type": "linux",
"iso_url": "{{user `iso_url`}}",
"iso_checksum": "{{user `iso_checksum`}}",
"iso_checksum_type": "{{user `iso_checksum_type`}}",
"disk_size" : "{{user `disk`}}",
"http_directory": "www",
"boot_command": [
"<esc><wait>",
"<esc><wait>",
"<enter><wait>",
"/install/vmlinuz <wait>",
"auto <wait>",
"console-setup/ask_detect=false <wait>",
"console-setup/layoutcode=us <wait>",
"console-setup/modelcode=pc105 <wait>",
"debconf/frontend=noninteractive <wait>",
"debian-installer=en_US <wait>",
"fb=false <wait>",
"initrd=/install/initrd.gz <wait>",
"kbd-chooser/method=us <wait>",
"keyboard-configuration/layout=USA <wait>",
"keyboard-configuration/variant=USA <wait>",
"locale=en_US <wait>",
"netcfg/get_hostname={{user `hostname`}} <wait>",
"netcfg/get_domain=example.com <wait>",
"noapic <wait>",
"preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed`}} <wait>",
"-- <wait>",
"<enter><wait>"
],
"boot_wait": "10s",
"ssh_username": "{{user `ssh_username`}}",
"ssh_password": "{{user `ssh_password`}}",
"ssh_port": 22,
"ssh_wait_timeout": "10000s",
"tools_upload_flavor": "linux",
"tools_upload_path": "/tmp/{{.Flavor}}.iso",
"shutdown_command": "echo 'shutdown -P now' > /tmp/shutdown.sh; echo '{{user `ssh_password`}}'|sudo -S sh '/tmp/shutdown.sh'",
"vmx_data": {
"memsize": "{{user `memory`}}",
"numvcpus": "{{user `cpus`}}",
"cpuid.coresPerSocket": "1"
}
}

],
"provisioners": [
{
Expand All @@ -66,12 +113,27 @@
"scripts": [
"scripts/debian/base.sh",
"scripts/debian/packages-precise.sh",
"scripts/debian/virtualbox.sh",
"scripts/vagrant-key.sh",
"scripts/udev-cleanup.sh",
"scripts/debian/apt.sh"
]
},
{
"type": "shell",
"execute_command": "echo '{{user `ssh_password`}}'|sudo -S sh '{{.Path}}'",
"only": ["virtualbox-iso"],
"scripts": [
"scripts/debian/virtualbox.sh"
]
},
{
"type": "shell",
"execute_command": "echo '{{user `ssh_password`}}'|sudo -S sh '{{.Path}}'",
"only": ["vmware-iso"],
"scripts": [
"scripts/debian/vmware.sh"
]
},
{
"type": "puppet-masterless",
"manifest_file": "puppet/manifests/{{user `configuration`}}.pp",
Expand All @@ -93,6 +155,9 @@
"override": {
"virtualbox": {
"output": "pug-{{user `hostname`}}-{{user `arch`}}-virtualbox.box"
},
"vmware": {
"output": "pug-{{user `hostname`}}-{{user `arch`}}-vmware.box"
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions puppetmaster.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,9 @@
"override": {
"virtualbox": {
"output": "pug-{{user `hostname`}}-{{user `arch`}}-virtualbox.box"
},
"vmware": {
"output": "pug-{{user `hostname`}}-{{user `arch`}}-vmware.box"
}
}
}
Expand Down
44 changes: 43 additions & 1 deletion scientific.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,29 @@
[ "modifyvm", "{{.Name}}", "--memory", "{{user `memory`}}" ],
[ "modifyvm", "{{.Name}}", "--cpus", "{{user `cpus`}}" ]
]
},
{
"type": "vmware-iso",
"guest_os_type": "linux",
"iso_url": "{{user `iso_url`}}",
"iso_checksum": "{{user `iso_checksum`}}",
"iso_checksum_type": "{{user `iso_checksum_type`}}",
"disk_size" : "{{user `disk`}}",
"http_directory": "www",
"boot_command": [
"<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `kickstart`}}<enter><wait>"
],
"boot_wait": "10s",
"ssh_username": "{{user `ssh_username`}}",
"ssh_password": "{{user `ssh_password`}}",
"ssh_port": 22,
"ssh_wait_timeout": "10000s",
"shutdown_command": "echo 'shutdown -P now' > /tmp/shutdown.sh; echo '{{user `ssh_password`}}'|sudo -S sh '/tmp/shutdown.sh'",
"vmx_data": {
"memsize": "{{user `memory`}}",
"numvcpus": "{{user `cpus`}}",
"cpuid.coresPerSocket": "1"
}
}
],
"provisioners": [
Expand All @@ -46,11 +69,27 @@
"scripts/enterprise/base.sh",
"scripts/vagrant-key.sh",
"scripts/enterprise/scientific.sh",
"scripts/enterprise/virtualbox.sh",
"scripts/enterprise/repos.sh",
"scripts/udev-cleanup.sh"
]
},
{
"type": "shell",
"execute_command": "echo '{{user `ssh_password`}}'|sudo -S sh '{{.Path}}'",
"only": ["virtualbox-iso"],
"scripts": [
"scripts/enterprise/virtualbox.sh"
]
},
{
"type": "shell",
"execute_command": "echo '{{user `ssh_password`}}'|sudo -S sh '{{.Path}}'",
"only": ["vmware-iso"],
"scripts": [
"scripts/enterprise/vmware-el6.sh",
"scripts/enterprise/vmnetwork.sh"
]
},
{
"type": "puppet-masterless",
"manifest_file": "puppet/manifests/{{user `configuration`}}.pp",
Expand All @@ -72,6 +111,9 @@
"override": {
"virtualbox": {
"output": "pug-{{user `hostname`}}-{{user `arch`}}-virtualbox.box"
},
"vmware": {
"output": "pug-{{user `hostname`}}-{{user `arch`}}-vmware.box"
}
}
}
Expand Down
13 changes: 13 additions & 0 deletions scripts/debian/vmware.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
apt-get install -y linux-source build-essential
# Extract Tarball from iso
mount /tmp/linux.iso /media
mkdir /tmp/vmware-tools
cp /media/* /tmp/vmware-tools/.
umount /media
rm -f /tmp/linux.iso

tar -xzf /tmp/vmware-tools/*.tar.gz -C /tmp/vmware-tools

echo "Installing vmware tools"
/tmp/vmware-tools/vmware-tools-distrib/vmware-install.pl --default
echo "Done"
68 changes: 67 additions & 1 deletion trusty.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,54 @@
[ "modifyvm", "{{.Name}}", "--memory", "{{user `memory`}}" ],
[ "modifyvm", "{{.Name}}", "--cpus", "{{user `cpus`}}" ]
]
},
{
"type": "vmware-iso",
"guest_os_type": "linux",
"iso_url": "{{user `iso_url`}}",
"iso_checksum": "{{user `iso_checksum`}}",
"iso_checksum_type": "{{user `iso_checksum_type`}}",
"disk_size" : "{{user `disk`}}",
"http_directory": "www",
"boot_command": [
"<esc><wait>",
"<esc><wait>",
"<enter><wait>",
"/install/vmlinuz <wait>",
"auto <wait>",
"console-setup/ask_detect=false <wait>",
"console-setup/layoutcode=us <wait>",
"console-setup/modelcode=pc105 <wait>",
"debconf/frontend=noninteractive <wait>",
"debian-installer=en_US <wait>",
"fb=false <wait>",
"initrd=/install/initrd.gz <wait>",
"kbd-chooser/method=us <wait>",
"keyboard-configuration/layout=USA <wait>",
"keyboard-configuration/variant=USA <wait>",
"locale=en_US <wait>",
"netcfg/get_hostname={{user `hostname`}} <wait>",
"netcfg/get_domain=example.com <wait>",
"noapic <wait>",
"preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed`}} <wait>",
"-- <wait>",
"<enter><wait>"
],
"boot_wait": "10s",
"ssh_username": "{{user `ssh_username`}}",
"ssh_password": "{{user `ssh_password`}}",
"ssh_port": 22,
"ssh_wait_timeout": "10000s",
"shutdown_command": "echo 'shutdown -P now' > /tmp/shutdown.sh; echo '{{user `ssh_password`}}'|sudo -S sh '/tmp/shutdown.sh'",

"tools_upload_flavor": "linux",
"tools_upload_path": "/tmp/{{.Flavor}}.iso",
"shutdown_command": "echo 'shutdown -P now' > /tmp/shutdown.sh; echo '{{user `ssh_password`}}'|sudo -S sh '/tmp/shutdown.sh'",
"vmx_data": {
"memsize": "{{user `memory`}}",
"numvcpus": "{{user `cpus`}}",
"cpuid.coresPerSocket": "1"
}
}
],
"provisioners": [
Expand All @@ -66,12 +114,27 @@
"scripts": [
"scripts/debian/base.sh",
"scripts/debian/packages-trusty.sh",
"scripts/debian/virtualbox.sh",
"scripts/vagrant-key.sh",
"scripts/udev-cleanup.sh",
"scripts/debian/apt.sh"
]
},
{
"type": "shell",
"execute_command": "echo '{{user `ssh_password`}}'|sudo -S sh '{{.Path}}'",
"only": ["virtualbox-iso"],
"scripts": [
"scripts/debian/virtualbox.sh"
]
},
{
"type": "shell",
"execute_command": "echo '{{user `ssh_password`}}'|sudo -S sh '{{.Path}}'",
"only": ["vmware-iso"],
"scripts": [
"scripts/debian/vmware.sh"
]
},
{
"type": "puppet-masterless",
"manifest_file": "puppet/manifests/{{user `configuration`}}.pp",
Expand All @@ -93,6 +156,9 @@
"override": {
"virtualbox": {
"output": "pug-{{user `hostname`}}-{{user `arch`}}-virtualbox.box"
},
"vmware": {
"output": "pug-{{user `hostname`}}-{{user `arch`}}-vmware.box"
}
}
}
Expand Down

0 comments on commit 5af1b1c

Please sign in to comment.