fix(fedora): install dhcp-server

saltstack-formulas · Apr 9, 2020 · b91a3b1 · b91a3b1
1 parent 984117f
commit b91a3b1
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/dhcpd/osmap.yaml b/dhcpd/osmap.yaml
@@ -15,7 +15,8 @@ Ubuntu: {}
 Raspbian: {}
 
 # os_family: RedHat
-Fedora: {}
+Fedora:
+  server: dhcp-server
 CentOS: {}
 Amazon: {}
 

diff --git a/test/integration/default/controls/config_spec.rb b/test/integration/default/controls/config_spec.rb
@@ -204,10 +204,10 @@ class "foo" {
   title 'should be generated properly'
 
   only_if(
-    'the service configuration file is only available on the Debian, RedHat ' \
-    '& FreeBSD platform families'
+    'the service configuration file is only available on the Debian, RedHat, ' \
+    'Fedora & FreeBSD platform families'
   ) do
-    ['debian', 'redhat', 'freebsd'].include?(platform[:family])
+    ['debian', 'redhat', 'fedora', 'freebsd'].include?(platform[:family])
   end
 
   describe file(service_config_filename) do

diff --git a/test/integration/default/controls/yaml_dump_spec.rb b/test/integration/default/controls/yaml_dump_spec.rb
@@ -223,7 +223,7 @@
         service_config: /etc/default/isc-dhcp-server
         #{common06}
       YAML_DUMP
-    when 'redhat', 'fedora'
+    when 'redhat'
       <<~YAML_DUMP.chomp
         #{common01}
         config: #{config}
@@ -237,6 +237,20 @@
         service_config: /etc/systemd/system/dhcpd.service.d/override.conf
         #{common06}
       YAML_DUMP
+    when 'fedora'
+      <<~YAML_DUMP.chomp
+        #{common01}
+        config: #{config}
+        #{common02}
+        enable: #{enable}
+        #{common03}
+        #{common04}
+        server: dhcp-server
+        #{common05}
+        service: #{service}
+        service_config: /etc/systemd/system/dhcpd.service.d/override.conf
+        #{common06}
+      YAML_DUMP
     when 'suse'
       <<~YAML_DUMP.chomp
         #{common01}
@@ -275,7 +289,7 @@
           enable: #{enable}
           #{common03}
           #{common04}
-          server: dhcp
+          server: #{server}
           #{common05}
           service: dhcpd4
           #{common06}