bin/perms.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 aws_acct_id="823003027569"
+aws_acct_id_plus="886593122405"
 bucket="internet2-tier-appliance-us-west-1"
 
 ova_key=$(aws s3api list-objects --bucket $bucket --query 'reverse(sort_by(Contents[?contains(Key, `ova`)], &LastModified))[0].[Key]' --output text | tr -d '\n' )
@@ -13,10 +14,8 @@ 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"
-
-ami_image_description=$(aws ec2 describe-images --image-ids $ami_id --query 'Images[0].{Description:Tags[0].Value}')
-echo $ami_image_description
+echo "Publishing $ami_id to all accounts"
 
 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\"}]}"
 

comanage-appliance.json

@@ -10,7 +10,8 @@
       "ssh_password": "centos",
       "region": "us-west-1",
       "timestamper": "{{timestamp}}",
-      "outputfile_name": "comanage-appliance-centos7"
+      "outputfile_name": "comanage-appliance-centos7",
+      "build_number": "{{env `BUILD_NUMBER`}}"
   },
   "provisioners": [
     {
@@ -27,6 +28,10 @@
       "type": "shell",
       "execute_command": "echo 'centos' | {{.Vars}} sudo -S -E bash '{{.Path}}'",
       "script": "scripts/cleanup.sh"
+    },
+    {
+      "type": "shell",
+      "inline": ["sudo echo 'TIERBUILD='{{user `build_number`}} > /home/centos/buildenv.bash"]
     }
   ],
   "builders": [
@@ -41,8 +46,8 @@
             ["modifyvm", "{{.Name}}", "--memory", "{{user `memory`}}"],
             ["modifyvm", "{{.Name}}", "--cpus", "{{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_url": "http://mirrors.mit.edu/centos/7/isos/x86_64/CentOS-7-x86_64-Minimal-1804.iso",
+        "iso_checksum": "714acc0aefb32b7d51b515e25546835e55a90da9fb00417fbee2d03a62801efd",
         "iso_checksum_type": "sha256",
         "http_directory": "http",
         "boot_command": ["<tab> text ks=http://{{.HTTPIP}}:{{.HTTPPort}}/ks-{{user `profile`}}.cfg<enter><wait>"],
@@ -61,16 +66,17 @@
     {
       "type": "compress",
       "compression_level": "9",
-      "output": "builds/{{user `outputfile_name`}}-ova-{{user `timestamper`}}.tar"
+      "output": "builds/TIER-{{user `outputfile_name`}}-ova-{{user `timestamper`}}.tar"
     },
     {
       "type": "amazon-import",
       "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`}}"
+        "Description": "packer amazon-import-comanage-appliance {{user `timestamper`}}",
+        "Name": "TIER-COmanage Build: {{user `build_number`}}"
       }
     }
   ]

grouper-appliance.json

@@ -72,7 +72,8 @@
       "region": "{{user `region`}}",
       "s3_bucket_name": "internet2-tier-ami-import-us-west-1",
       "tags": {
-        "Description": "packer amazon-import-grouper-appliance {{user `timestamper`}}"
+        "Description": "packer amazon-import-grouper-appliance {{user `timestamper`}}",
+        "Name": "TIER-Shibb Build: {{user `build_number`}}"
       }
     }
   ]

scripts/ansible.sh

@@ -5,3 +5,9 @@ yum -y install epel-release
 
 # Install Ansible.
 yum -y install ansible
+
+# Install Yum Crom 
+yum -y install yum-cron
+
+# Install Cloud init support
+# yum -y install cloud-init 

scripts/cleanup.sh

@@ -5,7 +5,7 @@ dd if=/dev/zero of=/EMPTY bs=1M
 rm -f /EMPTY
 
 # Disable the centos user
-chsh -s /bin/false centos
+# chsh -s /bin/false centos
 
 # Add `sync` so Packer doesn't quit too early, before the large file is deleted.
 sync

shibboleth-appliance.json

@@ -71,7 +71,6 @@
       "access_key": "{{user `aws_access_key`}}",
       "secret_key": "{{user `aws_secret_key`}}",
       "region": "{{user `region`}}",
-      "ami_name": "TIER-Shibb Build: {{user `build_number`}}",
       "s3_bucket_name": "internet2-tier-ami-import-us-west-1",
       "tags": {
         "Description": "packer amazon-import-shibboleth-appliance {{user `timestamper`}}",