From 4e696072aa4ea33852cc0ef450a2c4b3acc46f7f Mon Sep 17 00:00:00 2001 From: Forrest Alvarez Date: Wed, 22 Jan 2014 06:20:53 +0000 Subject: [PATCH] Updated the map with some proper service names, modified the init to reflect this, brought the readme up to standards. --- README.rst | 16 +++++++++++++--- dhcpd/init.sls | 1 + dhcpd/map.jinja | 2 ++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index 663ad18..4ee9378 100644 --- a/README.rst +++ b/README.rst @@ -1,7 +1,17 @@ dhcpd ===== -dhcpd ------ +Formulas to install and start dhcpd. -Install and turn on a basic dhcpd daemon +.. note:: + + See the full `Salt Formulas installation and usage instructions + `_. + +Available states +================ + +``dhcpd`` +--------- + +Install and turn on a basic dhcpd daemon. diff --git a/dhcpd/init.sls b/dhcpd/init.sls index f042d24..4f02739 100644 --- a/dhcpd/init.sls +++ b/dhcpd/init.sls @@ -4,6 +4,7 @@ dhcpd: pkg.installed: - name: {{ dhcpd.server }} service.running: + - name: {{ dhcpd.service }} - enable: True - require: - pkg: dhcpd diff --git a/dhcpd/map.jinja b/dhcpd/map.jinja index 5b60c9f..e207317 100644 --- a/dhcpd/map.jinja +++ b/dhcpd/map.jinja @@ -1,8 +1,10 @@ {% set dhcpd = salt['grains.filter_by']({ 'Debian': { 'server': 'isc-dhcp-server', + 'service': 'isc-dhcp-server', }, 'RedHat': { 'server': 'dhcp', + 'service' 'dhcpd', }, }, merge=salt['pillar.get']('dhcpd:lookup')) %}