Removing vagrant processing and build vagrant

docker · Nov 15, 2016 · 7d8c21a · 7d8c21a
1 parent 62f1408
commit 7d8c21a
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 23 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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`}}",