Merge branch 'AMIname' into shibboleth-production

docker · Feb 16, 2017 · 45b7c89 · 45b7c89
2 parents e1a5d2f + c944b81
commit 45b7c89
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/comanage-appliance.json b/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": [
     {
@@ -70,7 +71,8 @@
       "region": "{{user `region`}}",
       "s3_bucket_name": "internet2-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`}}"
       }
     }
   ]

diff --git a/grouper-appliance.json b/grouper-appliance.json
@@ -11,7 +11,8 @@
       "ssh_password": "centos",
       "region": "us-west-1",
       "timestamper": "{{timestamp}}",
-      "outputfile_name": "grouper-appliance-centos7"
+      "outputfile_name": "grouper-appliance-centos7",
+      "build_number": "{{env `BUILD_NUMBER`}}"
   },
   "provisioners": [
     {
@@ -43,8 +44,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>"],
@@ -72,7 +73,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-Grouper Build: {{user `build_number`}}"
       }
     }
   ]