]> review.fuel-infra Code Review - tools/sustaining.git/commitdiff
DNS enhancement 40/16240/1
authorDenis V. Meltsaykin <dmeltsaykin@mirantis.com>
Tue, 19 Jan 2016 12:08:40 +0000 (15:08 +0300)
committerDenis V. Meltsaykin <dmeltsaykin@mirantis.com>
Tue, 19 Jan 2016 12:08:40 +0000 (15:08 +0300)
As we hardcode "peerdns=no" in eth0 during master node deployment
a dirty hack is needed to make resolver work. This change introduces new
option "DNS1=$ADMIN_SUBNET_GATEWAY" to ifcfg-eth1, although this address
is not in eth1-network it will work anyway.

Change-Id: I9ed1148b9acbd4e2539186421a31ec7996398ea1

jenkins/build_cluster/build_cluster.py

index 25f4cd87225221c47bcd9f77c9057d5179ff0e65..7e1c4d27c18b62f25d1773ed1a0fca46f216416d 100755 (executable)
@@ -450,10 +450,12 @@ def inject_ifconfig_ssh():
         "IPADDR={ip}\n" \
         "NETMASK={netmask}\n" \
         "GATEWAY={gw}\n" \
+        "DNS1={dns}\n" \
         .format(
             ip=str(cfg["PUBLIC_SUBNET"].ip + 2),
             netmask=str(cfg["PUBLIC_SUBNET"].netmask),
-            gw=str(cfg["PUBLIC_SUBNET"].ip + 1)
+            gw=str(cfg["PUBLIC_SUBNET"].ip + 1),
+            dns=str(cfg["ADMIN_SUBNET"].ip + 1)
         )
     print ("\nTo fuel:\n{0}".format(rule))
     ifcfg = "/etc/sysconfig/network-scripts/ifcfg-eth1"