From 7d8c21af4eaf3d53586f0cd08a46967062b4ab9f Mon Sep 17 00:00:00 2001
From: villadalmine <rino@atadata.com>
Date: Tue, 15 Nov 2016 18:59:27 +0100
Subject: [PATCH 1/3] Removing vagrant processing and build vagrant

---
 bin/perms.sh              | 10 ++--------
 comanage-appliance.json   |  5 -----
 grouper-appliance.json    |  5 -----
 shibboleth-appliance.json |  5 -----
 4 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/bin/perms.sh b/bin/perms.sh
index cf3b5d4..c764a8c 100755
--- a/bin/perms.sh
+++ b/bin/perms.sh
@@ -1,17 +1,10 @@
 #!/bin/bash
 
 aws_acct_id="823003027569"
+aws_acct_id_plus="886593122405"
 bucket="internet2-tier-appliance-us-west-1"
-vagrant_key=$(aws s3api list-objects --bucket $bucket --query 'reverse(sort_by(Contents[?contains(Key, `vagrant`)], &LastModified))[0].[Key]' --output text | tr -d '\n' )
 ova_key=$(aws s3api list-objects --bucket $bucket --query 'reverse(sort_by(Contents[?contains(Key, `ova`)], &LastModified))[0].[Key]' --output text | tr -d '\n' )
 
-echo "Found $vagrant_key"
-aws s3api put-object-acl --bucket $bucket --key $vagrant_key  --acl public-read
-
-echo "(https://s3-us-west-1.amazonaws.com/$bucket/$vagrant_key)"
-
-echo $(md5sum builds/$vagrant_key)
-
 echo "Found $ova_key"
 aws s3api put-object-acl --bucket $bucket --key $ova_key  --acl public-read
 
@@ -26,4 +19,5 @@ ami_image_description=$(aws ec2 describe-images --image-ids $ami_id --query 'Ima
 echo $ami_image_description
 
 aws ec2 modify-image-attribute --image-id $ami_id --launch-permission "{\"Add\":[{\"UserId\":\"$aws_acct_id\"}]}"
+aws ec2 modify-image-attribute --image-id $ami_id --launch-permission "{\"Add\":[{\"UserId\":\"$aws_acct_id_plus\"}]}"
 
diff --git a/comanage-appliance.json b/comanage-appliance.json
index 28a30cc..84f02c3 100644
--- a/comanage-appliance.json
+++ b/comanage-appliance.json
@@ -63,11 +63,6 @@
       "compression_level": "9",
       "output": "builds/{{user `outputfile_name`}}-ova-{{user `timestamper`}}.tar"
     },
-    {
-      "type": "vagrant",
-      "compression_level": "9",
-      "output": "builds/{{user `outputfile_name`}}-vagrant-{{user `timestamper`}}.box"
-    },
     {
       "type": "amazon-import",
       "access_key": "{{user `aws_access_key`}}",
diff --git a/grouper-appliance.json b/grouper-appliance.json
index e4418e4..77859ca 100644
--- a/grouper-appliance.json
+++ b/grouper-appliance.json
@@ -65,11 +65,6 @@
       "compression_level": "9",
       "output": "builds/{{user `outputfile_name`}}-ova-{{user `timestamper`}}.tar"
     },
-    {
-      "type": "vagrant",
-      "compression_level": "9",
-      "output": "builds/{{user `outputfile_name`}}-vagrant-{{user `timestamper`}}.tar"
-    },
     {
       "type": "amazon-import",
       "access_key": "{{user `aws_access_key`}}",
diff --git a/shibboleth-appliance.json b/shibboleth-appliance.json
index e3cccf9..a58007e 100644
--- a/shibboleth-appliance.json
+++ b/shibboleth-appliance.json
@@ -65,11 +65,6 @@
       "compression_level": "9",
       "output": "builds/{{user `outputfile_name`}}-ova-{{user `timestamper`}}.tar"
     },
-    {
-      "type": "vagrant",
-      "compression_level": "9",
-      "output": "builds/{{user `outputfile_name`}}-vagrant-{{user `timestamper`}}.tar"
-    },
     {
       "type": "amazon-import",
       "access_key": "{{user `aws_access_key`}}",

From cf09458164c71bff94f9f6d7ba85ed6024605843 Mon Sep 17 00:00:00 2001
From: villadalmine <rino.rondan@levvel.io>
Date: Tue, 15 Nov 2016 21:03:02 +0100
Subject: [PATCH 2/3] Update perms.sh

---
 bin/perms.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/perms.sh b/bin/perms.sh
index c764a8c..26e6852 100755
--- a/bin/perms.sh
+++ b/bin/perms.sh
@@ -13,7 +13,7 @@ echo "(https://s3-us-west-1.amazonaws.com/$bucket/$ova_key)"
 echo $(md5sum builds/$ova_key)
 
 ami_id=$(aws ec2 describe-images --owners $aws_acct_id --query 'reverse(sort_by(Images[?starts_with(Name, `import-ami`)], &CreationDate))[0].[ImageId]' --output text | tr -d '\n' )
-echo "Publishing $ami_id to $aws_acct_id"
+echo "Publishing $ami_id to all accounts"
 
 ami_image_description=$(aws ec2 describe-images --image-ids $ami_id --query 'Images[0].{Description:Tags[0].Value}')
 echo $ami_image_description

From a77745c42a333cdf9ee4d0181f3b71556166a1a6 Mon Sep 17 00:00:00 2001
From: Jim Van Fleet <jim.van.fleet@levvel.io>
Date: Mon, 9 Jan 2017 14:22:11 -0500
Subject: [PATCH 3/3] Updating ISO

---
 grouper-appliance.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grouper-appliance.json b/grouper-appliance.json
index 77859ca..68da9cb 100644
--- a/grouper-appliance.json
+++ b/grouper-appliance.json
@@ -43,8 +43,8 @@
             ["modifyvm", "{{.Name}}", "--cpus", "{{user `cpus`}}"],
             ["modifyvm", "{{.Name}}", "--ostype", "{{user `guest_os_type`}}"]
         ],
-        "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_url": "http://mirrors.mit.edu/centos/7/isos/x86_64/CentOS-7-x86_64-Minimal-1611.iso",
+        "iso_checksum": "27bd866242ee058b7a5754e83d8ee8403e216b93d130d800852a96f41c34d86a",
         "iso_checksum_type": "sha256",
         "http_directory": "http",
         "boot_command": ["<tab> text ks=http://{{.HTTPIP}}:{{.HTTPPort}}/ks-{{user `profile`}}.cfg<enter><wait>"],