Merge pull request #2948 from babarinde/master

mboersma · mboersma · commit 442ea707e76f · 2015-01-23T10:05:38.000-07:00
fix (contrib/gce/create-gce-user-data): replace discovery_url with discovery
diff --git a/contrib/gce/create-gce-user-data b/contrib/gce/create-gce-user-data
@@ -62,7 +62,7 @@ def main():
     configuration = combine_dicts(configuration_coreos_template,
                                   configuration_gce_template)
 
-    configuration["coreos"]["etcd"]["discovery_url"] = url
+    configuration["coreos"]["etcd"]["discovery"] = url
 
     with gce_user_data as outfile:
         try:
