kunsi/bundlewrap
1
0
Fork 0
Code Issues 1 Pull requests Releases Activity

bundles/dhcpd: remove some .get()
All checks were successful
bundlewrap/pipeline/head This commit looks good
Details

Browse source
This commit is contained in:
Franzi 2020-11-15 12:01:32 +01:00
parent ad569f073e
commit d5bca495e0
Signed by: kunsi
GPG key ID: 12E3D2136B818350
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bundles/dhcpd/items.py
View file

@ -2,7 +2,7 @@ files = {
'/etc/dhcp/dhcpd.conf': { '/etc/dhcp/dhcpd.conf': {
'content_type': 'mako', 'content_type': 'mako',
'context': { 'context': {
'dhcp_config': node.metadata.get('dhcpd'), 'dhcp_config': node.metadata['dhcpd'],
}, },
'needs': { 'needs': {
'pkg_apt:isc-dhcp-server' 'pkg_apt:isc-dhcp-server'
@ -14,7 +14,8 @@ files = {
'/etc/default/isc-dhcp-server': { '/etc/default/isc-dhcp-server': {
'content_type': 'mako', 'content_type': 'mako',
'context': { 'context': {
'listen_interfaces': node.metadata.get('dhcpd', {}).get('listen_interfaces'), # Set by our own metadata reactor. Guaranteed to exist.
'listen_interfaces': node.metadata['dhcpd']['listen_interfaces'],
}, },
'needs': { 'needs': {
'pkg_apt:isc-dhcp-server' 'pkg_apt:isc-dhcp-server'

4
bundles/dhcpd/metadata.py
View file

@ -28,7 +28,7 @@ def get_static_allocations(metadata):
def get_listen_interfaces(metadata): def get_listen_interfaces(metadata):
listen_interfaces = [] listen_interfaces = []
for identfier, subnet in node.metadata.get('dhcpd/subnets', {}).items(): for identfier, subnet in node.metadata.get('dhcpd/subnets', {}).items():
listen_interfaces.append(subnet.get('interface')) listen_interfaces.append(subnet['interface'])
return { return {
'dhcpd': { 'dhcpd': {
@ -41,7 +41,7 @@ def get_listen_interfaces(metadata):
def iptables(metadata): def iptables(metadata):
iptables = set() iptables = set()
for identfier, subnet in node.metadata.get('dhcpd/subnets', {}).items(): for identfier, subnet in node.metadata.get('dhcpd/subnets', {}).items():
iptables.add('iptables -A INPUT -i {} -p udp --dport 67:68 -j ACCEPT'.format(subnet.get('interface'))) iptables.add('iptables -A INPUT -i {} -p udp --dport 67:68 -j ACCEPT'.format(subnet['interface']))
return { return {
'iptables': { 'iptables': {