Convert Google credentials file to single line environment variable (…

…rather than pushing the file itself to Atlas)
ducxinh · Sep 13, 2016 · 8746351 · 8746351
1 parent cd9de66
commit 8746351
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/packer/google/ubuntu/base.json b/packer/google/ubuntu/base.json
@@ -1,6 +1,7 @@
 {
   "variables": {
     "atlas_username":   "{{env `ATLAS_USERNAME`}}",
+    "gce_credentials":  "{{env `GCE_CREDENTIALS`}}",
     "gce_project_id":   "{{env `GCE_PROJECT_ID`}}",
     "gce_zone":         "{{env `GCE_DEFAULT_ZONE`}}",
     "gce_source_image": "{{env `GCE_SOURCE_IMAGE`}}",
@@ -14,7 +15,6 @@
     "name": "{{user `atlas_username`}}/{{user `name`}}",
     "base_dir": "../../../packer",
     "include": [
-      "google/account.json",
       "{{user `scripts_dir`}}/*",
       "{{user `scripts_dir`}}/ubuntu/*",
       "{{user `scripts_dir`}}/ubuntu/upstart/*",
@@ -33,7 +33,7 @@
     {
       "type":              "googlecompute",
       "project_id":        "{{user `gce_project_id`}}",
-      "account_file":      "google/account.json",
+      "account_file":      "{{user `gce_credentials`}}",
       "zone":              "{{user `gce_zone`}}",
       "network":           "default",
       "source_image":      "{{user `gce_source_image`}}",
@@ -91,4 +91,4 @@
       }
     }
   ]
-}
+}
diff --git a/packer/google/ubuntu/consul.json b/packer/google/ubuntu/consul.json
@@ -4,6 +4,7 @@
     "gce_project_id":   "{{env `GCE_PROJECT_ID`}}",
     "gce_zone":         "{{env `GCE_DEFAULT_ZONE`}}",
     "gce_source_image": "{{env `GCE_SOURCE_IMAGE`}}",
+    "gce_credentials":  "{{env `GCE_CREDENTIALS`}}",
     "name":             "google-ubuntu-consul",
     "scripts_dir":      "scripts",
     "config_dir":       "config",
@@ -14,7 +15,6 @@
     "name": "{{user `atlas_username`}}/{{user `name`}}",
     "base_dir": "../../../packer",
     "include": [
-      "google/account.json",
       "{{user `scripts_dir`}}/*",
       "{{user `scripts_dir`}}/ubuntu/*",
       "{{user `scripts_dir`}}/ubuntu/upstart/*",
@@ -33,7 +33,7 @@
     {
       "type":              "googlecompute",
       "project_id":        "{{user `gce_project_id`}}",
-      "account_file":      "google/account.json",
+      "account_file":      "{{user `gce_credentials`}}",
       "zone":              "{{user `gce_zone`}}",
       "network":           "default",
       "source_image":      "{{user `gce_source_image`}}",
@@ -88,4 +88,4 @@
       }
     }
   ]
-}
+}
diff --git a/packer/google/ubuntu/haproxy.json b/packer/google/ubuntu/haproxy.json
@@ -4,6 +4,7 @@
     "gce_project_id":   "{{env `GCE_PROJECT_ID`}}",
     "gce_zone":         "{{env `GCE_DEFAULT_ZONE`}}",
     "gce_source_image": "{{env `GCE_SOURCE_IMAGE`}}",
+    "gce_credentials":  "{{env `GCE_CREDENTIALS`}}",
     "name":             "google-ubuntu-haproxy",
     "scripts_dir":      "scripts",
     "config_dir":       "config",
@@ -14,7 +15,6 @@
     "name": "{{user `atlas_username`}}/{{user `name`}}",
     "base_dir": "../../../packer",
     "include": [
-      "google/account.json",
       "{{user `scripts_dir`}}/*",
       "{{user `scripts_dir`}}/ubuntu/*",
       "{{user `scripts_dir`}}/ubuntu/upstart/*",
@@ -33,7 +33,7 @@
     {
       "type":              "googlecompute",
       "project_id":        "{{user `gce_project_id`}}",
-      "account_file":      "google/account.json",
+      "account_file":      "{{user `gce_credentials`}}",
       "zone":              "{{user `gce_zone`}}",
       "network":           "default",
       "source_image":      "{{user `gce_source_image`}}",

diff --git a/packer/google/ubuntu/nodejs.json b/packer/google/ubuntu/nodejs.json
@@ -4,6 +4,7 @@
     "gce_project_id":   "{{env `GCE_PROJECT_ID`}}",
     "gce_zone":         "{{env `GCE_DEFAULT_ZONE`}}",
     "gce_source_image": "{{env `GCE_SOURCE_IMAGE`}}",
+    "gce_credentials":  "{{env `GCE_CREDENTIALS`}}",
     "name":             "google-ubuntu-nodejs",
     "scripts_dir":      "scripts",
     "config_dir":       "config",
@@ -14,7 +15,6 @@
     "name": "{{user `atlas_username`}}/{{user `name`}}",
     "base_dir": "../../../packer",
     "include": [
-      "google/account.json",
       "{{user `scripts_dir`}}/*",
       "{{user `scripts_dir`}}/ubuntu/*",
       "{{user `scripts_dir`}}/ubuntu/upstart/*",
@@ -34,7 +34,7 @@
     {
       "type":              "googlecompute",
       "project_id":        "{{user `gce_project_id`}}",
-      "account_file":      "google/account.json",
+      "account_file":      "{{user `gce_credentials`}}",
       "zone":              "{{user `gce_zone`}}",
       "network":           "default",
       "source_image":      "{{user `gce_source_image`}}",
@@ -101,4 +101,4 @@
       }
     }
   ]
-}
+}
diff --git a/packer/google/ubuntu/vault.json b/packer/google/ubuntu/vault.json
@@ -4,6 +4,7 @@
     "gce_project_id":   "{{env `GCE_PROJECT_ID`}}",
     "gce_zone":         "{{env `GCE_DEFAULT_ZONE`}}",
     "gce_source_image": "{{env `GCE_SOURCE_IMAGE`}}",
+    "gce_credentials":  "{{env `GCE_CREDENTIALS`}}",
     "name":             "google-ubuntu-vault",
     "scripts_dir":      "scripts",
     "config_dir":       "config",
@@ -14,7 +15,6 @@
     "name": "{{user `atlas_username`}}/{{user `name`}}",
     "base_dir": "../../../packer",
     "include": [
-      "google/account.json",
       "{{user `scripts_dir`}}/*",
       "{{user `scripts_dir`}}/ubuntu/*",
       "{{user `scripts_dir`}}/ubuntu/upstart/*",
@@ -33,7 +33,7 @@
     {
       "type":              "googlecompute",
       "project_id":        "{{user `gce_project_id`}}",
-      "account_file":      "google/account.json",
+      "account_file":      "{{user `gce_credentials`}}",
       "zone":              "{{user `gce_zone`}}",
       "network":           "default",
       "source_image":      "{{user `gce_source_image`}}",