Skip to content

@jvonau's new fix for dhcp_service2, as community transitions from named/BIND towards dnsmasq #1202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
holta merged 2 commits into from
Oct 9, 2018
Merged

@jvonau's new fix for dhcp_service2, as community transitions from named/BIND towards dnsmasq #1202

holta merged 2 commits into from
Oct 9, 2018

Conversation

@jvonau
Copy link
Contributor

@jvonau jvonau commented Oct 9, 2018

Fixes Bug

Description of changes proposed in this pull request.

Smoke-tested in operating system.

Mention a team member for further information or comment using @ name

jvonau added 2 commits October 9, 2018 11:50
@jvonau
Explicitly disable dnsmasq when in Appliance mode
bb6b3c2 
otherwise dnsmasq will become active upon reboot because enable_services.yml
would still be acting upon local_vars.yml where dnsmasq_enabled is set to True
while there is not LAN interface available to bind the service to.
@jvonau
explicitly identify which primary dhcp server is being disabled
9d616cf 
dhcp_service2 is used in restart.yml when not in Appliance mode
@holta holta added this to the 6.7 milestone Oct 9, 2018
@holta
Copy link
Member

holta commented Oct 9, 2018

Builds on #1184 PRs #1185 #1188

@holta
Copy link
Member

holta commented Oct 9, 2018

Basic smoke-test successful on Ubuntu 18.04

@holta
Copy link
Member

holta commented Oct 9, 2018

Is network/tasks/restarts.yml correct here?

- name: dhcp_server may be affected - starting - user choice
  service:
    name: "{{ dhcp_service2 }}"
    state: restarted
  when: iiab_network_mode != "Appliance"

@holta
Copy link
Member

holta commented Oct 9, 2018

I'd like these 2 lines in roles/network/defaults/main.yml so everything is more understandable to newcomers:

#dhcp_service: ????                 # Set in individual OS's /opt/iiab/iiab/vars/<OS>.yml for use in roles/network/tasks/dhcpd.yml
#dhcp_service2: "dhcpd disabled"    # Moved to roles/network/tasks/computed_services.yml during transition from named to dnsmasq (PR #1202)

@holta holta changed the title Dhcp2 @jvonau's new fix for dhcp_service2, as community transitions from named/BIND towards dnsmasq Oct 9, 2018
@holta holta mentioned this pull request Oct 9, 2018
Merged
@holta holta merged commit 9d616cf into iiab:master Oct 9, 2018
@holta holta mentioned this pull request Oct 9, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

enhancement

Projects

None yet

Milestone

6.7

Development

Successfully merging this pull request may close these issues.

2 participants

@jvonau @holta