annotate dns.py @ 70:136d86d06ce6

dns improvements
author drewp@bigasterisk.com
date Sat, 11 Jun 2022 22:53:23 -0700
parents 49a69852a4f4
children 3f7d4626234c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
38
4026b6b8028f get dhcp mapping from lanscape
drewp@bigasterisk.com
parents: 34
diff changeset
1 import subprocess
4026b6b8028f get dhcp mapping from lanscape
drewp@bigasterisk.com
parents: 34
diff changeset
2 import tempfile
4026b6b8028f get dhcp mapping from lanscape
drewp@bigasterisk.com
parents: 34
diff changeset
3
4026b6b8028f get dhcp mapping from lanscape
drewp@bigasterisk.com
parents: 34
diff changeset
4 import requests
34
d4fb38f13c79 refactor dns and some other non-net setup
drewp@bigasterisk.com
parents:
diff changeset
5 from pyinfra import host
d4fb38f13c79 refactor dns and some other non-net setup
drewp@bigasterisk.com
parents:
diff changeset
6 from pyinfra.operations import apt, files, server, systemd
d4fb38f13c79 refactor dns and some other non-net setup
drewp@bigasterisk.com
parents:
diff changeset
7
38
4026b6b8028f get dhcp mapping from lanscape
drewp@bigasterisk.com
parents: 34
diff changeset
8
4026b6b8028f get dhcp mapping from lanscape
drewp@bigasterisk.com
parents: 34
diff changeset
9 def prepare_dhcp_hosts():
4026b6b8028f get dhcp mapping from lanscape
drewp@bigasterisk.com
parents: 34
diff changeset
10 lanscape_ip = subprocess.check_output([
4026b6b8028f get dhcp mapping from lanscape
drewp@bigasterisk.com
parents: 34
diff changeset
11 'kubectl',
4026b6b8028f get dhcp mapping from lanscape
drewp@bigasterisk.com
parents: 34
diff changeset
12 'get',
4026b6b8028f get dhcp mapping from lanscape
drewp@bigasterisk.com
parents: 34
diff changeset
13 'svc',
4026b6b8028f get dhcp mapping from lanscape
drewp@bigasterisk.com
parents: 34
diff changeset
14 '--field-selector=metadata.name=lanscape',
4026b6b8028f get dhcp mapping from lanscape
drewp@bigasterisk.com
parents: 34
diff changeset
15 "-o=jsonpath={.items[0].spec.clusterIP}",
4026b6b8028f get dhcp mapping from lanscape
drewp@bigasterisk.com
parents: 34
diff changeset
16 ],
4026b6b8028f get dhcp mapping from lanscape
drewp@bigasterisk.com
parents: 34
diff changeset
17 encoding='ascii')
4026b6b8028f get dhcp mapping from lanscape
drewp@bigasterisk.com
parents: 34
diff changeset
18 url = f'http://{lanscape_ip}/dnsConfig'
4026b6b8028f get dhcp mapping from lanscape
drewp@bigasterisk.com
parents: 34
diff changeset
19 resp = requests.get(url)
4026b6b8028f get dhcp mapping from lanscape
drewp@bigasterisk.com
parents: 34
diff changeset
20 resp.raise_for_status()
4026b6b8028f get dhcp mapping from lanscape
drewp@bigasterisk.com
parents: 34
diff changeset
21 lanscape_config = resp.json()
4026b6b8028f get dhcp mapping from lanscape
drewp@bigasterisk.com
parents: 34
diff changeset
22
4026b6b8028f get dhcp mapping from lanscape
drewp@bigasterisk.com
parents: 34
diff changeset
23 dhcp_hosts = tempfile.NamedTemporaryFile(mode='wt', encoding='ascii')
4026b6b8028f get dhcp mapping from lanscape
drewp@bigasterisk.com
parents: 34
diff changeset
24 dhcp_hosts.write("# written by pyinfra\n\n")
4026b6b8028f get dhcp mapping from lanscape
drewp@bigasterisk.com
parents: 34
diff changeset
25 for row in lanscape_config['dhcp_table']:
65
49a69852a4f4 let's get in less trouble by using dhcp more universally
drewp@bigasterisk.com
parents: 61
diff changeset
26 dhcp_hosts.write(f'{row["mac"]},{row["hostname"]},{row["ip"]},24h\n')
38
4026b6b8028f get dhcp mapping from lanscape
drewp@bigasterisk.com
parents: 34
diff changeset
27 dhcp_hosts.flush()
4026b6b8028f get dhcp mapping from lanscape
drewp@bigasterisk.com
parents: 34
diff changeset
28 return dhcp_hosts
4026b6b8028f get dhcp mapping from lanscape
drewp@bigasterisk.com
parents: 34
diff changeset
29
4026b6b8028f get dhcp mapping from lanscape
drewp@bigasterisk.com
parents: 34
diff changeset
30
70
136d86d06ce6 dns improvements
drewp@bigasterisk.com
parents: 65
diff changeset
31 #files.link('/etc/resolv.conf', '/run/systemd/resolve/stub-resolv.conf')
136d86d06ce6 dns improvements
drewp@bigasterisk.com
parents: 65
diff changeset
32
136d86d06ce6 dns improvements
drewp@bigasterisk.com
parents: 65
diff changeset
33 # files.file(path='/etc/resolv.conf', present=False)
136d86d06ce6 dns improvements
drewp@bigasterisk.com
parents: 65
diff changeset
34 # files.link(path='/etc/resolv.conf', present=False) # bug
136d86d06ce6 dns improvements
drewp@bigasterisk.com
parents: 65
diff changeset
35 # server.shell(["rm -f /etc/resolv.conf"]) # broken fix
136d86d06ce6 dns improvements
drewp@bigasterisk.com
parents: 65
diff changeset
36 files.template(src='templates/resolv.conf.j2',
136d86d06ce6 dns improvements
drewp@bigasterisk.com
parents: 65
diff changeset
37 dest='/etc/resolv.conf',
136d86d06ce6 dns improvements
drewp@bigasterisk.com
parents: 65
diff changeset
38 # review this- it's probably a bad dep on bang. maybe both 10.5.0.1 and a public ns would be ok
136d86d06ce6 dns improvements
drewp@bigasterisk.com
parents: 65
diff changeset
39 ns='10.5.0.1' if host.name in ['prime', 'plus'] else '10.2.0.1',
136d86d06ce6 dns improvements
drewp@bigasterisk.com
parents: 65
diff changeset
40 force=True)
136d86d06ce6 dns improvements
drewp@bigasterisk.com
parents: 65
diff changeset
41
34
d4fb38f13c79 refactor dns and some other non-net setup
drewp@bigasterisk.com
parents:
diff changeset
42 if host.name == 'bang':
d4fb38f13c79 refactor dns and some other non-net setup
drewp@bigasterisk.com
parents:
diff changeset
43 apt.packages(packages=['dnsmasq'])
d4fb38f13c79 refactor dns and some other non-net setup
drewp@bigasterisk.com
parents:
diff changeset
44 systemd.service(service='dnsmasq', enabled=False, running=False)
d4fb38f13c79 refactor dns and some other non-net setup
drewp@bigasterisk.com
parents:
diff changeset
45 files.directory(path='/opt/dnsmasq')
d4fb38f13c79 refactor dns and some other non-net setup
drewp@bigasterisk.com
parents:
diff changeset
46
38
4026b6b8028f get dhcp mapping from lanscape
drewp@bigasterisk.com
parents: 34
diff changeset
47 dhcp_hosts = prepare_dhcp_hosts()
4026b6b8028f get dhcp mapping from lanscape
drewp@bigasterisk.com
parents: 34
diff changeset
48
61
b46df76991b6 10.1 cleanups; verbose settings; address updates
drewp@bigasterisk.com
parents: 53
diff changeset
49 for net_name in ['10.2', '10.5']:
34
d4fb38f13c79 refactor dns and some other non-net setup
drewp@bigasterisk.com
parents:
diff changeset
50 files.directory(path=f'/opt/dnsmasq/{net_name}')
d4fb38f13c79 refactor dns and some other non-net setup
drewp@bigasterisk.com
parents:
diff changeset
51 files.template(src='templates/dnsmasq/dnsmasq.conf.j2', dest=f'/opt/dnsmasq/{net_name}/dnsmasq.conf', net=net_name)
d4fb38f13c79 refactor dns and some other non-net setup
drewp@bigasterisk.com
parents:
diff changeset
52 files.template(src='templates/dnsmasq/hosts.j2', dest=f'/opt/dnsmasq/{net_name}/hosts', net=net_name)
38
4026b6b8028f get dhcp mapping from lanscape
drewp@bigasterisk.com
parents: 34
diff changeset
53 files.template(src=dhcp_hosts.name, dest=f'/opt/dnsmasq/{net_name}/dhcp_hosts', net=net_name)
34
d4fb38f13c79 refactor dns and some other non-net setup
drewp@bigasterisk.com
parents:
diff changeset
54
d4fb38f13c79 refactor dns and some other non-net setup
drewp@bigasterisk.com
parents:
diff changeset
55 files.template(src='templates/dnsmasq/dnsmasq.service.j2',
d4fb38f13c79 refactor dns and some other non-net setup
drewp@bigasterisk.com
parents:
diff changeset
56 dest=f'/etc/systemd/system/dnsmasq_{net_name}.service',
d4fb38f13c79 refactor dns and some other non-net setup
drewp@bigasterisk.com
parents:
diff changeset
57 net=net_name)
44
e3249dd163fc turn on 10.5 dnsmasq service
drewp@bigasterisk.com
parents: 38
diff changeset
58 systemd.service(service=f'dnsmasq_{net_name}', enabled=True, restarted=True, daemon_reload=True)
34
d4fb38f13c79 refactor dns and some other non-net setup
drewp@bigasterisk.com
parents:
diff changeset
59
d4fb38f13c79 refactor dns and some other non-net setup
drewp@bigasterisk.com
parents:
diff changeset
60 if host.name in [
d4fb38f13c79 refactor dns and some other non-net setup
drewp@bigasterisk.com
parents:
diff changeset
61 'garage',
d4fb38f13c79 refactor dns and some other non-net setup
drewp@bigasterisk.com
parents:
diff changeset
62 'dash',
d4fb38f13c79 refactor dns and some other non-net setup
drewp@bigasterisk.com
parents:
diff changeset
63 'slash',
d4fb38f13c79 refactor dns and some other non-net setup
drewp@bigasterisk.com
parents:
diff changeset
64 'frontbed',
d4fb38f13c79 refactor dns and some other non-net setup
drewp@bigasterisk.com
parents:
diff changeset
65 'prime',
70
136d86d06ce6 dns improvements
drewp@bigasterisk.com
parents: 65
diff changeset
66 'pipe'
34
d4fb38f13c79 refactor dns and some other non-net setup
drewp@bigasterisk.com
parents:
diff changeset
67 ]:
d4fb38f13c79 refactor dns and some other non-net setup
drewp@bigasterisk.com
parents:
diff changeset
68 files.template(src='templates/hosts.j2', dest='/etc/hosts')
d4fb38f13c79 refactor dns and some other non-net setup
drewp@bigasterisk.com
parents:
diff changeset
69 files.template(src='templates/resolved.conf.j2', dest='/etc/systemd/resolved.conf')
d4fb38f13c79 refactor dns and some other non-net setup
drewp@bigasterisk.com
parents:
diff changeset
70 systemd.service(service='systemd-resolved.service', running=True, restarted=True)