software/galene: use automated_local_dns as URL for local DNS slaves

software/galene/buildout.hash.cfg

@@ -19,4 +19,4 @@ md5sum = 0d6db8da45bbdf311f9c6a2f916045a2
 
 [template-default]
 filename = instance-default.cfg.in
-md5sum = 452599c3067904a9decb8c5dba55eb46
+md5sum = 339a47644377509a754c9ead038728a6

software/galene/instance-default.cfg.in

@@ -11,7 +11,7 @@ parts =
   monitor-base
   port-listening-promise
   galene-service
-{% if slapparameter_dict.get('dns_sr_url', '') %}
+{% if slapparameter_dict.get('request_dns', '') %}
   request-dns-entry
 {% endif %}
 
@@ -27,7 +27,7 @@ recipe = slapos.cookbook:publish
 url = https://[$${galene-wrapper:ip}]:$${galene-wrapper:port}
 admin-user = $${admin-password:username}
 admin-password = $${admin-password:passwd}
-{% if slapparameter_dict.get('dns_sr_url', '') %}
+{% if slapparameter_dict.get('request_dns', '') %}
 domain-url = https://$${request-dns-entry:connection-domain}:$${galene-wrapper:port}
 {% endif %}
 
@@ -131,11 +131,11 @@ name = galene-port-listening.py
 config-host = $${slap-configuration:ipv6-random}
 config-port = 8443
 
-{% if slapparameter_dict.get('dns_sr_url', '') %}
+{% if slapparameter_dict.get('request_dns', '') %}
 [request-dns-entry]
 name = dns-galene-entry
 recipe = slapos.cookbook:request.serialised
-software-url = {{ slapparameter_dict['dns_sr_url'] }}
+software-url = automated_local_dns
 software-type = core-network
 server-url = {{ slap_connection['server-url'] }}
 computer-id = {{ slap_connection['computer-id'] }}

software/galene/instance-ptt-default-input-schema.json

@@ -15,11 +15,11 @@
       "type": "boolean",
       "default": true
     },
-    "dns_sr_url": {
-      "default": "",
-      "title": "DNS SR URL",
-      "description": "URL of the SR running the DNS server",
-      "type": "string"
+    "request_dns": {
+      "title": "Request DNS",
+      "description": "Request local DNS to a core network running on the same node",
+      "type": "boolean",
+      "default": true
     }
   }
 }