diff options
| author |   Marcel Enguehard <mengueha+fdio@cisco.com> | 2017-05-23 10:50:17 +0200 |
|---|---|---|
| committer | Marcel Enguehard <mengueha+fdio@cisco.com> | 2017-05-23 08:57:12 +0000 |
| commit | be0b435d307173598c30fcacc421b17112137099 (patch) | |
| tree | ed8aae7eef796eb7381d21937b095a036733789a /vicn/resource/linux/dnsmasq.py | |
| parent | 895a6328d6e64948ed213e8fbbb3ab15aca0df43 (diff) | |
Introduced groups + lxd profiles + diverted control network handling to lxd + misc bug fixes
Change-Id: Iae26bc2994ac9704dde7dfa8fbe4be1b74cf9e6f
Signed-off-by: Marcel Enguehard <mengueha+fdio@cisco.com>
Diffstat (limited to 'vicn/resource/linux/dnsmasq.py')
| -rw-r--r-- | vicn/resource/linux/dnsmasq.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/vicn/resource/linux/dnsmasq.py b/vicn/resource/linux/dnsmasq.py index e18f750f..b5aa8053 100644 --- a/vicn/resource/linux/dnsmasq.py +++ b/vicn/resource/linux/dnsmasq.py @@ -42,7 +42,6 @@ TPL_CONF=''' interface=$interface dhcp-range=$dhcp_range -dhcp-host=00:0e:c6:81:79:01,192.168.128.200,12h #server=$server $flags @@ -60,12 +59,12 @@ class DnsMasq(Service, DnsServer): __package_names__ = ['dnsmasq'] __service_name__ = 'dnsmasq' - interface = Attribute(Interface, + interface = Attribute(Interface, description = 'Interface on which to listen') lease_interval = Attribute(String, default = '12h') server = Attribute(String) - dhcp_authoritative = Attribute(Bool, + dhcp_authoritative = Attribute(Bool, description = 'Flag: DHCP authoritative', default = True) log_queries = Attribute(Bool, description = 'Flag: log DNS queries', @@ -80,10 +79,7 @@ class DnsMasq(Service, DnsServer): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) if not self.interface: - if self.node.bridge: - self.interface = self.node.bridge - else: - self.interface = self.node.host_interface + raise Exception("Cannot initialize bridge without interface") def __subresources__(self): # Overwrite configuration file |