Merge pull request hashicorp#724 from frodenas/google_ubuntu_images

armon · armon · commit 150da4720f24 · 2015-01-05T11:27:07.000-08:00
provider/google: Add Ubuntu images
diff --git a/builtin/providers/google/image.go b/builtin/providers/google/image.go
@@ -24,6 +24,7 @@ func readImage(c *Config, name string) (*compute.Image, error) {
 		"opensuse": "opensuse-cloud",
 		"rhel":     "rhel-cloud",
 		"sles":     "suse-cloud",
+		"ubuntu":   "ubuntu-os-cloud",
 	}
 
 	// If we match a lookup for an alternate project, then try that next.

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ func readImage(c Config, name string) (compute.Image, error) {`
`24`	`24`	`"opensuse": "opensuse-cloud",`
`25`	`25`	`"rhel": "rhel-cloud",`
`26`	`26`	`"sles": "suse-cloud",`
	`27`	`+ "ubuntu": "ubuntu-os-cloud",`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`// If we match a lookup for an alternate project, then try that next.`