Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: docker/packer-centos-7
base: master
Choose a base ref
...
head repository: docker/packer-centos-7
compare: support-for-vmx-appliance
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 6 commits
  • 3 files changed
  • 1 contributor

Commits on Sep 30, 2016

  1. Support for vmware / vmx format shibboleth appliance.

    Mason Packard committed Sep 30, 2016
    Copy the full SHA
    01157b0 View commit details

  2. Additional robustness for shibboleth appliance build.

    Mason Packard committed Sep 30, 2016
    Copy the full SHA
    48c33cf View commit details

  3. Refactor shibboleth appliance build for more robust appliance name.

    Mason Packard committed Sep 30, 2016
    Copy the full SHA
    374c757 View commit details

  4. Refactor shibboleth appliance build for more robust appliance name.

    Mason Packard committed Sep 30, 2016
    Copy the full SHA
    1894c1c View commit details

  5. Add comanage appliance support for vmware / vmx format.

    Mason Packard committed Sep 30, 2016
    Copy the full SHA
    7a1f52a View commit details

  6. Add grouper appliance support for vmware / vmx format.

    Mason Packard committed Sep 30, 2016
    Loading status checks…
    Copy the full SHA
    1c27969 View commit details
Showing with 132 additions and 9 deletions.
  1. +44 −3 comanage-appliance.json
  2. +44 −3 grouper-appliance.json
  3. +44 −3 shibboleth-appliance.json
47 changes: 44 additions & 3 deletions comanage-appliance.json
View file
@@ -32,7 +32,7 @@
"builders": [
{
"type": "virtualbox-iso",
"name": "{{user `outputfile_name`}}",
"name": "{{user `outputfile_name`}}-ova",
"vm_name": "{{user `outputfile_name`}}-{{user `profile`}}",
"headless": true,
"guest_os_type": "RedHat_64",
@@ -55,25 +55,66 @@
"shutdown_command": "sudo -S shutdown -P now",
"output_directory": "output-comanage-{{user `profile`}}",
"format": "ova"
},
{
"type": "vmware-iso",
"name": "{{user `outputfile_name`}}-vmx",
"vm_name": "{{user `outputfile_name`}}-{{user `profile`}}",
"headless": true,
"guest_os_type": "RedHat",
"disk_size": "{{user `disk_size`}}",
"vmx_data": {
"cpuid.coresPerSocket": "{{user `cpus`}}",
"memsize": "{{user `memory`}}",
"numvcpus": "{{user `cpus`}}"
},
"iso_url": "http://mirror.vcu.edu/pub/gnu+linux/centos/7/isos/x86_64/CentOS-7-x86_64-Minimal-1511.iso",
"iso_checksum": "f90e4d28fa377669b2db16cbcb451fcb9a89d2460e3645993e30e137ac37d284",
"iso_checksum_type": "sha256",
"http_directory": "http",
"boot_command": ["<tab> text ks=http://{{.HTTPIP}}:{{.HTTPPort}}/ks-{{user `profile`}}.cfg<enter><wait>"],
"boot_wait": "10s",
"ssh_username": "{{user `ssh_username`}}",
"ssh_password": "{{user `ssh_password`}}",
"ssh_port": 22,
"ssh_wait_timeout": "10000s",
"shutdown_command": "sudo -S shutdown -P now",
"output_directory": "output-comanage-vmware-{{user `profile`}}",
"format": "vmx"
}
],
"post-processors": [
{
"type": "compress",
"only": ["{{user `outputfile_name`}}-ova"],
"compression_level": "9",
"output": "builds/{{user `outputfile_name`}}-ova-{{user `timestamper`}}.tar"
},
{
"type": "vagrant",
"only": ["{{user `outputfile_name`}}-ova"],
"compression_level": "9",
"output": "builds/{{user `outputfile_name`}}-ova-vagrant-{{user `timestamper`}}.tar"
},
{
"type": "compress",
"only": ["{{user `outputfile_name`}}-vmx"],
"compression_level": "9",
"output": "builds/{{user `outputfile_name`}}-vmx-vmware-{{user `timestamper`}}.tar"
},
{
"type": "vagrant",
"only": ["{{user `outputfile_name`}}-vmx"],
"compression_level": "9",
"output": "builds/{{user `outputfile_name`}}-vagrant-{{user `timestamper`}}.box"
"output": "builds/{{user `outputfile_name`}}-vagrant-vmware-{{user `timestamper`}}.tar"
},
{
"type": "amazon-import",
"only": ["{{user `outputfile_name`}}-ova"],
"access_key": "{{user `aws_access_key`}}",
"secret_key": "{{user `aws_secret_key`}}",
"region": "{{user `region`}}",
"s3_bucket_name": "internet2-ami-import-us-west-1",
"s3_bucket_name": "internet2-tier-ami-import-us-west-1",
"tags": {
"Description": "packer amazon-import-comanage-appliance {{user `timestamper`}}"
}
47 changes: 44 additions & 3 deletions grouper-appliance.json
View file
@@ -33,8 +33,8 @@
"builders": [
{
"type": "virtualbox-iso",
"name": "grouper-appliance-centos7",
"vm_name": "grouper-appliance-centos7-{{user `profile`}}",
"name": "{{user `outputfile_name`}}-ova",
"vm_name": "{{user `outputfile_name`}}-{{user `profile`}}",
"headless": true,
"guest_os_type": "RedHat_64",
"disk_size": "{{user `disk_size`}}",
@@ -57,21 +57,62 @@
"shutdown_command": "sudo -S shutdown -P now",
"output_directory": "output-grouper-{{user `profile`}}",
"format": "ova"
},
{
"type": "vmware-iso",
"name": "{{user `outputfile_name`}}-vmx",
"vm_name": "{{user `outputfile_name`}}-{{user `profile`}}",
"headless": true,
"guest_os_type": "RedHat",
"disk_size": "{{user `disk_size`}}",
"vmx_data": {
"cpuid.coresPerSocket": "{{user `cpus`}}",
"memsize": "{{user `memory`}}",
"numvcpus": "{{user `cpus`}}"
},
"iso_url": "http://mirror.vcu.edu/pub/gnu+linux/centos/7/isos/x86_64/CentOS-7-x86_64-Minimal-1511.iso",
"iso_checksum": "f90e4d28fa377669b2db16cbcb451fcb9a89d2460e3645993e30e137ac37d284",
"iso_checksum_type": "sha256",
"http_directory": "http",
"boot_command": ["<tab> text ks=http://{{.HTTPIP}}:{{.HTTPPort}}/ks-{{user `profile`}}.cfg<enter><wait>"],
"boot_wait": "10s",
"ssh_username": "{{user `ssh_username`}}",
"ssh_password": "{{user `ssh_password`}}",
"ssh_port": 22,
"ssh_wait_timeout": "10000s",
"shutdown_command": "sudo -S shutdown -P now",
"output_directory": "output-grouper-vmware-{{user `profile`}}",
"format": "vmx"
}
],
"post-processors": [
{
"type": "compress",
"only": ["{{user `outputfile_name`}}-ova"],
"compression_level": "9",
"output": "builds/{{user `outputfile_name`}}-ova-{{user `timestamper`}}.tar"
},
{
"type": "vagrant",
"only": ["{{user `outputfile_name`}}-ova"],
"compression_level": "9",
"output": "builds/{{user `outputfile_name`}}-ova-vagrant-{{user `timestamper`}}.tar"
},
{
"type": "compress",
"only": ["{{user `outputfile_name`}}-vmx"],
"compression_level": "9",
"output": "builds/{{user `outputfile_name`}}-vmx-vmware-{{user `timestamper`}}.tar"
},
{
"type": "vagrant",
"only": ["{{user `outputfile_name`}}-vmx"],
"compression_level": "9",
"output": "builds/{{user `outputfile_name`}}-vagrant-{{user `timestamper`}}.tar"
"output": "builds/{{user `outputfile_name`}}-vagrant-vmware-{{user `timestamper`}}.tar"
},
{
"type": "amazon-import",
"only": ["{{user `outputfile_name`}}-ova"],
"access_key": "{{user `aws_access_key`}}",
"secret_key": "{{user `aws_secret_key`}}",
"region": "{{user `region`}}",
47 changes: 44 additions & 3 deletions shibboleth-appliance.json
View file
@@ -33,8 +33,8 @@
"builders": [
{
"type": "virtualbox-iso",
"name": "shibboleth-appliance-centos7",
"vm_name": "shibboleth-appliance-centos7-{{user `profile`}}",
"name": "{{user `outputfile_name`}}-ova",
"vm_name": "{{user `outputfile_name`}}-{{user `profile`}}",
"headless": true,
"guest_os_type": "RedHat_64",
"disk_size": "{{user `disk_size`}}",
@@ -57,21 +57,62 @@
"shutdown_command": "sudo -S shutdown -P now",
"output_directory": "output-shibboleth-{{user `profile`}}",
"format": "ova"
},
{
"type": "vmware-iso",
"name": "{{user `outputfile_name`}}-vmx",
"vm_name": "{{user `outputfile_name`}}-{{user `profile`}}",
"headless": true,
"guest_os_type": "RedHat",
"disk_size": "{{user `disk_size`}}",
"vmx_data": {
"cpuid.coresPerSocket": "{{user `cpus`}}",
"memsize": "{{user `memory`}}",
"numvcpus": "{{user `cpus`}}"
},
"iso_url": "http://mirror.vcu.edu/pub/gnu+linux/centos/7/isos/x86_64/CentOS-7-x86_64-Minimal-1511.iso",
"iso_checksum": "f90e4d28fa377669b2db16cbcb451fcb9a89d2460e3645993e30e137ac37d284",
"iso_checksum_type": "sha256",
"http_directory": "http",
"boot_command": ["<tab> text ks=http://{{.HTTPIP}}:{{.HTTPPort}}/ks-{{user `profile`}}.cfg<enter><wait>"],
"boot_wait": "10s",
"ssh_username": "{{user `ssh_username`}}",
"ssh_password": "{{user `ssh_password`}}",
"ssh_port": 22,
"ssh_wait_timeout": "10000s",
"shutdown_command": "sudo -S shutdown -P now",
"output_directory": "output-shibboleth-vmware-{{user `profile`}}",
"format": "vmx"
}
],
"post-processors": [
{
"type": "compress",
"only": ["{{user `outputfile_name`}}-ova"],
"compression_level": "9",
"output": "builds/{{user `outputfile_name`}}-ova-{{user `timestamper`}}.tar"
},
{
"type": "vagrant",
"only": ["{{user `outputfile_name`}}-ova"],
"compression_level": "9",
"output": "builds/{{user `outputfile_name`}}-ova-vagrant-{{user `timestamper`}}.tar"
},
{
"type": "compress",
"only": ["{{user `outputfile_name`}}-vmx"],
"compression_level": "9",
"output": "builds/{{user `outputfile_name`}}-vmx-vmware-{{user `timestamper`}}.tar"
},
{
"type": "vagrant",
"only": ["{{user `outputfile_name`}}-vmx"],
"compression_level": "9",
"output": "builds/{{user `outputfile_name`}}-vagrant-{{user `timestamper`}}.tar"
"output": "builds/{{user `outputfile_name`}}-vagrant-vmware-{{user `timestamper`}}.tar"
},
{
"type": "amazon-import",
"only": ["{{user `outputfile_name`}}-ova"],
"access_key": "{{user `aws_access_key`}}",
"secret_key": "{{user `aws_secret_key`}}",
"region": "{{user `region`}}",