Merge pull request #223 from dulek/helper-dns

Add ability to configure multiple DNS in DSAL helper

Author: mandre

tools/dsal/dsal_helper/dsal_helper.py

@@ -114,6 +114,11 @@ def _get_arg_parser(self):
                                            help='external network to use for '
                                                 'FIPs, defaults to "external"',
                                            default='external')
+        openshift_install_cfg.add_argument('--external-dns',
+                                           help='external DNS address to use, '
+                                                'use lab one if in doubt, '
+                                                'defaults to 1.1.1.1',
+                                           action='append')
         openshift_install_cfg.add_argument('--api-fip',
                                            help='FIP to use for API, if not '
                                                 'set will try to find or '
@@ -176,6 +181,9 @@ def openshift_install_cfg(self, args):
                 content = f.read()
             vars[key] = content.strip()
 
+        if not vars['external_dns']:
+            vars['external_dns'] = ['1.1.1.1']
+
         fips = self.neutron.ips(port_id=None)
         for key in ('api_fip', 'ingress_fip'):
             if not vars[key]:

tools/dsal/dsal_helper/templates/install-config.yaml.tpl

@@ -27,12 +27,17 @@ networking:
 platform:
   openstack:
     cloud:        	   "{{ cloud }}"
-    externalNetwork:   "external"
+    externalNetwork:   "{{ external_network }}"
     region:       	   "regionOne"
     computeFlavor:     "m1.xlarge"
     lbFloatingIP: 	   "{{ api_fip }}"
     ingressFloatingIP: "{{ ingress_fip }}"
-    externalDNS:  	   ["1.1.1.1"]
+    {%- if external_dns %}
+    externalDNS:
+    {%- for dns in external_dns %}
+    - {{ dns }}
+    {%- endfor %}
+    {%- endif %}
     clusterOSImage:    "rhcos"
 pullSecret: |
   {{ pull_secret }}