DOPS-101 Share packer ami between dops prod and sandbox

bin/validate.sh

@@ -2,7 +2,7 @@
 
 # Set bash unofficial strict mode http://redsymbol.net/articles/unofficial-bash-strict-mode/
 set -euo pipefail
- 
+
 # Set DEBUG to true for enhanced debugging: run prefixed with "DEBUG=true"
 ${DEBUG:-false} && set -vx
 # Credit to https://stackoverflow.com/a/17805088
@@ -30,6 +30,7 @@ $DOCKER_PACKER validate app/packer/machines/web-server.json
 if [[ "${SKIP_TERRAFORM:-false}" == "false" ]]; then
     DOCKER_TERRAFORM=$(get_docker_terraform)
     fmt=$($DOCKER_TERRAFORM fmt)
+    echo "Linting terraform files for formatting"
     if [[ -n "$fmt" ]]; then
         echo 'ERROR: these files are not formatted correctly. Run "terraform fmt"'
         echo "$fmt"
@@ -42,7 +43,6 @@ if [[ "${SKIP_TERRAFORM:-false}" == "false" ]]; then
         -var 'newrelic_license_key=ZZZZ' \
         -var 'newrelic_api_key=ZZZZ' \
         -var '[email protected]' \
-    echo "Linting terraform files for formatting"
 fi
 
 echo "Linting shell scripts"

packer/machines/web-server.json

@@ -18,7 +18,8 @@
         "vpc_id": "{{user `aws_vpc_id`}}",
         "ssh_username": "centos",
         "ami_name": "devops-infra-demo-centos-7-{{timestamp}}",
-        "ami_description": "DevOps Infrastructure Demo CentOS 7 - CIS hardened"
+        "ami_description": "DevOps Infrastructure Demo CentOS 7 - CIS hardened",
+        "ami_users": ["587267277416"] // Share with devops sandbox account
     }],
     "provisioners": [
         {

terraform/variables.tf

@@ -48,9 +48,10 @@ variable "google_project" {
   default     = "example-media"
 }
 
+# Use devops prod account as default. We bake and store AMIs using packer.
 variable "aws_account_id_for_ami" {
   description = "AWS Account ID where AMIs live, if not the default"
-  default     = ""
+  default     = "191447213457"
 }
 
 variable "ami_pattern" {