From 3e8d73a1929dea35cdaaeb9af793b1abc7aa536c Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Tue, 10 Oct 2017 13:06:20 -0500 Subject: [PATCH] treat ubuntu same as debian --- roles/network/tasks/enable_services.yml | 5 +++-- vars/ubuntu-16.yml | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/roles/network/tasks/enable_services.yml b/roles/network/tasks/enable_services.yml index e9ec16eef..f3840dc2a 100644 --- a/roles/network/tasks/enable_services.yml +++ b/roles/network/tasks/enable_services.yml @@ -1,7 +1,8 @@ -- name: Disable stock dhcp_service service +- name: Disable stock dhcp_service service: name={{ dhcp_service }} enabled=no - when: dhcpd_install and first_run and is_debian_9 + state=stopped + when: dhcpd_install and first_run - name: Disable dhcpd service service: name=dhcpd diff --git a/vars/ubuntu-16.yml b/vars/ubuntu-16.yml index 1971d5a18..be62d0718 100644 --- a/vars/ubuntu-16.yml +++ b/vars/ubuntu-16.yml @@ -2,6 +2,7 @@ is_debuntu: True is_ubuntu: True dns_service: bind9 dns_user: bind +dhcp_service: isc-dhcp-server proxy: squid proxy_user: proxy apache_service: apache2