apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed dhcpopts.conf for now as, it is the routing options and they seem to be dealt with dofferently in the new arrangement

Browse Source 
Changed the dhcp tests to avoid handing out the broadcast and gateway addresses :)
This commit is contained in:
Ian Southam 2014-08-25 15:00:36 +02:00 committed by wilderrodrigues
parent f21b90a73e
commit 5137d7e136
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
systemvm/patches/debian/config/opt/cloud/bin/CsDhcp.py
View File

@ -96,7 +96,7 @@ class CsDnsMasq(object):
def configure_server(self):
self.updated = self.updated | CsHelper.addifmissing(CLOUD_CONF, "dhcp-hostsfile=/etc/dhcphosts.txt")
self.updated = self.updated | CsHelper.addifmissing(DNSMASQ_CONF, "dhcp-optsfile=%s:" % DHCP_OPTS)
#self.updated = self.updated | CsHelper.addifmissing(DNSMASQ_CONF, "dhcp-optsfile=%s:" % DHCP_OPTS)
for i in self.devinfo:
if not i['dnsmasq']:
continue

2
test/systemvm/test_update_config.py
View File

@ -219,7 +219,7 @@ class UpdateConfigTestCase(SystemVMTestCase):
# This must happen in order for dnsmasq to be listening
octets = config['router_guest_ip'].split('.')
configs = []
for n in range(10):
for n in range(3,13):
ipb = ".".join(octets[0:3])
ipa = "%s.%s" % (ipb, n)
gw = "%s.1" % ipb