← Back to branch summary

~manjo/maas/msftocs-maas-enablement

« back to all changes in this revision

Viewing changes to src/maasserver/dhcp.py

  • Committer: MaaS Lander
  • Author(s): Raphael Badin
  • Date: 2015-01-30 14:37:00 UTC
  • mfrom: (3493.2.2 bug-1415538)
  • Revision ID: maas_lander-20150130143700-7xusprf1qry7ket0
[r=allenap][bug=1415538][author=rvb] Do not generate the 'option routers' stanza if router IP is None.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/maasserver/dhcp.py
56
56
        'subnet_cidr': unicode(interface.network.cidr),
57
57
        'broadcast_ip': interface.broadcast_ip,
58
58
        'interface': interface.interface,
59
 
        'router_ip': unicode(interface.router_ip),
 
59
        'router_ip': (
 
60
            None if not interface.router_ip
 
61
            else unicode(interface.router_ip)),
60
62
        'dns_servers': dns_servers,
61
63
        'ntp_server': ntp_server,
62
64
        'domain_name': interface.nodegroup.name,