update default variables and makefile

mettjus · mettjus · commit e8df9b7e5de7 · 2016-02-24T20:03:44.000+01:00
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ plan: etcd_discovery_url.txt kube_token.txt tls-assets/ca-key.pem tls-assets/ca.
 	terraform plan
 
 etcd_discovery_url.txt:
-	curl -s https://discovery.etcd.io/new?size=2 > etcd_discovery_url.txt
+	curl -s https://discovery.etcd.io/new?size=3 > etcd_discovery_url.txt
 
 destroy:
 	terraform destroy
diff --git a/variables.tf b/variables.tf
@@ -34,7 +34,7 @@ variable "num_worker" {
 }
 
 variable "ami" {
-    default = "ami-23b58613"
+    default = "ami-66e30706"
 }
 
 variable "etcd_instance_type" {
@@ -50,12 +50,7 @@ variable "worker_instance_type" {
 }
 
 variable "kubernetes_version" {
-    default = "0.17.1"
-}
-
-variable "etcd_version" {
-    description = "version of etcd to use"
-    default = "2.0.11"
+    default = "1.1.7"
 }
 
 variable "pod_network" {

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ variable "num_worker" {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`variable "ami" {`
`37`		`- default = "ami-23b58613"`
	`37`	`+ default = "ami-66e30706"`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`variable "etcd_instance_type" {`
`@@ -50,12 +50,7 @@ variable "worker_instance_type" {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`variable "kubernetes_version" {`
`53`		`- default = "0.17.1"`
`54`		`-}`
`55`		`-`
`56`		`-variable "etcd_version" {`
`57`		`- description = "version of etcd to use"`
`58`		`- default = "2.0.11"`
	`53`	`+ default = "1.1.7"`
`59`	`54`	`}`
`60`	`55`
`61`	`56`	`variable "pod_network" {`