From b28f60b44ddcf9dc070ff6986c776c5230e869d2 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sat, 15 Apr 2017 12:36:46 -0500 Subject: [PATCH] cli: Unify environment variables for GCP run GCP defines some "standard" environment variables for project and zone. Use them for 'moby run gcp'. Change the other environment variables to follow the same pattern. Signed-off-by: Rolf Neugebauer --- src/cmd/moby/gcp.go | 3 ++- src/cmd/moby/run_gcp.go | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/cmd/moby/gcp.go b/src/cmd/moby/gcp.go index 2272f447e..e7f4472a4 100644 --- a/src/cmd/moby/gcp.go +++ b/src/cmd/moby/gcp.go @@ -185,7 +185,8 @@ func (g GCPClient) CreateInstance(name, image, zone, machineType string, diskSiz } } - log.Infof("Creating instance %s from image %s", name, image) + log.Infof("Creating instance %s from image %s (type: %s in %s)", name, image, machineType, zone) + enabled := new(string) *enabled = "1" diff --git a/src/cmd/moby/run_gcp.go b/src/cmd/moby/run_gcp.go index 313865df5..f8d8b3e9c 100644 --- a/src/cmd/moby/run_gcp.go +++ b/src/cmd/moby/run_gcp.go @@ -13,15 +13,16 @@ const ( defaultZone = "europe-west1-d" defaultMachine = "g1-small" defaultDiskSize = 1 - zoneVar = "MOBY_GCP_ZONE" - machineVar = "MOBY_GCP_MACHINE" - keysVar = "MOBY_GCP_KEYS" - projectVar = "MOBY_GCP_PROJECT" - bucketVar = "MOBY_GCP_BUCKET" - familyVar = "MOBY_GCP_FAMILY" - publicVar = "MOBY_GCP_PUBLIC" - nameVar = "MOBY_GCP_IMAGE_NAME" - diskSizeVar = "MOBY_GCP_DISK_SIZE" + // Environment variables. Some are non-standard + zoneVar = "CLOUDSDK_COMPUTE_ZONE" + machineVar = "CLOUDSDK_COMPUTE_MACHINE" // non-standard + keysVar = "CLOUDSDK_COMPUTE_KEYS" // non-standard + projectVar = "CLOUDSDK_CORE_PROJECT" + bucketVar = "CLOUDSDK_IMAGE_BUCKET" // non-standard + familyVar = "CLOUDSDK_IMAGE_FAMILY" // non-standard + publicVar = "CLOUDSDK_IMAGE_PUBLIC" // non-standard + nameVar = "CLOUDSDK_IMAGE_NAME" // non-standard + diskSizeVar = "CLOUDSDK_DISK_SIZE" // non-standard ) // Process the run arguments and execute run