Skip to content

Commit

Permalink
Merge branch 'drybjed-dnsmasq-lxd-override'
Browse files Browse the repository at this point in the history
  • Loading branch information
drybjed committed Sep 5, 2019
2 parents 0cc1bd6 + 4b90b7d commit 2a5d05c
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 0 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,14 @@ Updates of upstream application versions
Fixed
~~~~~

:ref:`debops.dnsmasq` role
''''''''''''''''''''''''''

- On Ubuntu hosts, the role will fix the configuration installed by the
:command:`lxd` package to use ``bind-dynamic`` option instead of
``bind-interfaces``. This allows the :command:`dnsmasq` service to start
correctly.

:ref:`debops.nfs_server` role
'''''''''''''''''''''''''''''

Expand Down
10 changes: 10 additions & 0 deletions ansible/roles/debops.dnsmasq/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,16 @@ dnsmasq__default_configuration:
(ansible_local.consul.installed|d())|bool)
else "init" }}'

- name: 'lxd-override'
filename: 'lxd'
comment: |
Tell any system-wide dnsmasq instance to make sure to bind to interfaces
instead of listening on 0.0.0.0
raw: |
bind-dynamic
except-interface = lxdbr0
state: '{{ "present" if (ansible_distribution == "Ubuntu") else "ignore" }}'

- name: 'reserved-domains.conf'
options:

Expand Down

0 comments on commit 2a5d05c

Please sign in to comment.