ref(contrib): change discovery url setup in scripts

Author: aledbf

contrib/azure/create-azure-user-data

@@ -62,11 +62,12 @@ def main():
     configuration = combine_dicts(configuration_coreos_template,
                                   configuration_azure_template)
 
-    configuration["coreos"]["etcd2"]["discovery"] = url
+    dump = yaml.dump(configuration, default_flow_style=False)
+    dump = dump.replace('#DISCOVERY_URL', url)
 
     with azure_user_data as outfile:
         try:
-            outfile.write("#cloud-config\n\n" + yaml.dump(configuration, default_flow_style=False))
+            outfile.write("#cloud-config\n\n" + dump)
         except (IOError, ValueError):
             print "There was an issue writing to file " + azure_user_data.name
             return 1

contrib/gce/create-gce-user-data

@@ -62,14 +62,13 @@ def main():
     configuration = combine_dicts(configuration_coreos_template,
                                   configuration_gce_template)
 
-    configuration["coreos"]["etcd2"]["discovery"] = url
+    dump = yaml.dump(configuration, default_flow_style=False,
+                     default_style='|')
+    dump = dump.replace('#DISCOVERY_URL', url)
 
     with gce_user_data as outfile:
         try:
-            outfile.write("#cloud-config\n\n" +
-                          yaml.safe_dump(configuration,
-                                         default_flow_style=False,
-                                         default_style='|'))
+            outfile.write("#cloud-config\n\n" + dump)
         except (IOError, ValueError):
             print "There was an issue writing to file " + gce_user_data.name
             return 1

contrib/linode/create-linode-user-data.py

@@ -71,11 +71,13 @@ def main():
     configuration_coreos_template = yaml.safe_load(coreos_template)
 
     configuration = combine_dicts(configuration_coreos_template, configuration_linode_template)
-    configuration['coreos']['etcd']['discovery'] = 'https://discovery.etcd.io/' + str(etcd_token)
     configuration['ssh_authorized_keys'] = public_keys
 
+    dump = yaml.dump(configuration, default_flow_style=False, default_style='|')
+    dump = dump.replace('#DISCOVERY_URL', 'https://discovery.etcd.io/' + str(etcd_token))
+
     with linode_user_data as outfile:
-        outfile.write("#cloud-config\n\n" + yaml.safe_dump(configuration, default_flow_style=False, default_style='|'))
+        outfile.write("#cloud-config\n\n" + dump)
         log_success('Wrote Linode user data to ' + linode_user_data.name)