feat(map.jinja): specify package for Fedora 34

https://fedoraproject.org/wiki/Changes/NtpReplacement [skip ci]
saltstack-formulas · Apr 23, 2021 · 0616c83 · 0616c83
1 parent 3d2029d
commit 0616c83
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/ntp/ng/map.jinja b/ntp/ng/map.jinja
@@ -33,7 +33,7 @@
             'ntp_conf': '/etc/ntp.conf'
         },
         'Gentoo': {
-            'package': ' net-misc/ntp',
+            'package': 'net-misc/ntp',
             'service': 'ntpd',
             'ntp_conf': '/etc/ntp.conf'
         },
@@ -47,3 +47,8 @@
         }
     }, merge=True)
 } %}
+{#- Overwriting the `lookup` value isn't good practice but this is a
+    temporary fix until a newer `map.jinja` can be introduced #}
+{%- if grains.get("osfinger", "") == "Fedora-34" %}
+{%-   do ntp.lookup.update({"package": "ntpsec"}) %}
+{%- endif %}
diff --git a/test/integration/default/controls/packages_spec.rb b/test/integration/default/controls/packages_spec.rb
@@ -1,10 +1,16 @@
 # frozen_string_literal: true
 
+pkg =
+  case system.platform[:finger]
+  when 'fedora-34'
+    'ntpsec'
+  else
+    'ntp'
+  end
+
 control 'ntp package' do
   title 'should be installed'
 
-  pkg = 'ntp'
-
   describe package(pkg) do
     it { should be_installed }
   end