openstack
/
fuel-web
Code Issues Proposed changes

Remove config for dnsmasq.upstream 

fuelmenu no longer needs to configure
dnsmasq.upstream, as it is now set up
by puppet in the Cobbler container.

Change-Id: I5287aea29f886f7d67157e8a2200347523a2d5a4
Closes-Bug: #1500821
This commit is contained in:
Matthew Mosesohn 2015-09-29 18:13:30 +03:00
parent 2a327bd01e
commit a9439c43d1
2 changed files with 0 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fuelmenu/fuelmenu/modules/dnsandhostname.py
View File

@ -75,32 +75,8 @@ is accessible"}
self.oldsettings = self.load()
self.screen = None
self.fixDnsmasqUpstream()
self.fixEtcHosts()
def fixDnsmasqUpstream(self):
'''Called on init to apply default DNS settings.'''
#check upstream dns server
with open('/etc/dnsmasq.upstream', 'r') as f:
dnslines = f.readlines()
f.close()
if len(dnslines) > 0:
nameservers = dnslines[0].split(" ")[1:]
for nameserver in nameservers:
if not self.checkDNS(nameserver):
nameservers.remove(nameserver)
else:
nameservers = []
if nameservers == []:
#Write dnsmasq upstream server to default if it's not readable
with open('/etc/dnsmasq.upstream', 'w') as f:
nameservers = self.defaults['DNS_UPSTREAM'][
'value'].replace(',', ' ')
f.write("search {0}\n".format(self.defaults['DNS_SEARCH']))
f.write("domain {0}\n".format(self.defaults['DNS_DOMAIN']))
f.write("nameserver {0}\n".format(nameservers))
f.close()
def fixEtcHosts(self):
#replace ip for env variable HOSTNAME in /etc/hosts
if self.netsettings[self.parent.managediface]["addr"] != "":
@ -278,8 +254,6 @@ is accessible"}
for upstream_dns in responses['DNS_UPSTREAM'].split(','):
f.write("nameserver %s\n" % upstream_dns)
#Write dnsmasq upstream server
make_resolv_conf('/etc/dnsmasq.upstream')
# Create a temporary resolv.conf so DNS works before the cobbler
# container is up and running.
# TODO(asheplyakov): puppet does a similar thing, perhaps we can

16
fuelmenu/fuelmenu/modules/interfaces.py
View File

@ -94,22 +94,6 @@ class interfaces(urwid.WidgetWrap):
"value": ""},
}
def fixDnsmasqUpstream(self):
#check upstream dns server
with open('/etc/dnsmasq.upstream', 'r') as f:
dnslines = f.readlines()
nameservers = dnslines[0].split(" ")[1:]
#for nameserver in nameservers:
# if not self.checkDNS(nameserver):
# nameservers.remove(nameserver)
if nameservers == []:
#Write dnsmasq upstream server to default if it's not readable
with open('/etc/dnsmasq.upstream', 'w') as f:
nameservers = self.defaults['DNS_UPSTREAM']['value'].replace(
',', ' ')
f.write("nameserver %s\n" % nameservers)
f.close()
def fixEtcHosts(self):
#replace ip for env variable HOSTNAME in /etc/hosts
if self.netsettings[self.parent.managediface]["addr"] != "":