add official ubuntu support

diff --git a/metadata.json b/metadata.json
index 5eb2532443b81163ae54d574db773aace8973be9..00f81416edfcc7738ffd533e754272d7b4b0ba77 100644 (file)
--- a/metadata.json
+++ b/metadata.json
@@ -47,6 +47,14 @@
         "11"
       ]
     },
+    {
+      "operatingsystem": "Ubuntu",
+      "operatingsystemrelease": [
+        "14.04",
+        "16.04",
+        "18.04"
+      ]
+    },
     {
       "operatingsystem": "Fedora",
       "operatingsystemrelease": [

diff --git a/spec/classes/ferm_spec.rb b/spec/classes/ferm_spec.rb
index e039c149a4ac9d3852065fe57b111de7f23b64d8..dbf9cbd8cded5b46e7aeb27da7789bc802ef0005 100644 (file)
--- a/spec/classes/ferm_spec.rb
+++ b/spec/classes/ferm_spec.rb
@@ -31,14 +31,21 @@ describe 'ferm' do
 
         it { is_expected.to compile.with_all_deps }
         it { is_expected.to contain_service('ferm') }
+        if facts[:os]['name'] == "Ubuntu"
+          it { is_expected.to contain_file_line('enable_ferm') }
+        end
       end
       context 'with managed configfile' do
         let :params do
           { manage_configfile: true }
         end
 
+        if facts[:os]['name'] == 'Ubuntu'
+          it { is_expected.to contain_concat('/etc/ferm/ferm.conf') }
+        else
+          it { is_expected.to contain_concat('/etc/ferm.conf') }
+        end
         it { is_expected.to compile.with_all_deps }
-        it { is_expected.to contain_concat('/etc/ferm.conf') }
         it { is_expected.to contain_concat__fragment('ferm_header.conf') }
         it { is_expected.to contain_concat__fragment('ferm.conf') }
       end