Puppet8

example42 · Feb 3, 2024 · 121dc37 · 121dc37
1 parent 9ff4e53
commit 121dc37
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/docs/proxy.md b/docs/proxy.md
@@ -15,8 +15,8 @@ and manage proxy settings with:
         password: xxx # Optional
         no_proxy:
           - localhost
-          - "%{::domain}"
-          - "%{::fqdn}"
+          - "%{facts.networking.domain}"
+          - "%{facts.networking.fqdn}"
         scheme: http
 
 You can customise the components for which proxy should be configured, here are the default params:

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -82,7 +82,7 @@
 #         password: xxx # Optional
 #         no_proxy:
 #           - localhost
-#           - "%{::domain}"
+#           - "%{facts.networking.domain}"
 #         scheme: http
 #
 # @example Define arbitrary resources, with some defaults

diff --git a/manifests/puppet/postrun.pp b/manifests/puppet/postrun.pp
@@ -21,7 +21,7 @@
       noop($noop_value)
     }
 
-    $manage_content = tp_content($content, $template, $epp)
+    $manage_content = tp::content($content, $template, $epp)
 
     File {
       owner => 'root',

diff --git a/manifests/services/init_script.pp b/manifests/services/init_script.pp
@@ -12,7 +12,7 @@
   Optional[String] $service_ensure = undef,
   Variant[Undef,Boolean,String] $service_enable = undef,
 ) {
-  $manage_content = tp_content($content, $template, $epp)
+  $manage_content = tp::content($content, $template, $epp)
   file { "/etc/init.d/${title}":
     ensure  => $ensure,
     content => $manage_content,

diff --git a/manifests/services/systemd_script.pp b/manifests/services/systemd_script.pp
@@ -16,7 +16,7 @@
   Optional[String] $systemd_after    = 'network.target', # lint:ignore:optional_default
   Optional[String] $systemd_before   = undef,
 ) {
-  $manage_content = tp_content($content, $template, $epp)
+  $manage_content = tp::content($content, $template, $epp)
   file { $path:
     ensure  => $ensure,
     content => $manage_content,

diff --git a/manifests/tools/create_dir.pp b/manifests/tools/create_dir.pp
@@ -26,7 +26,7 @@
     command  => $mkdir_command,
     path     => $facts['path'],
     creates  => $path,
-    provider => $command_provider,
+    #provider => $command_provider,
   }
 
   if $facts['os']['family'] != 'windows' {

diff --git a/spec/fixtures/hiera.yaml b/spec/fixtures/hiera.yaml
@@ -4,6 +4,6 @@
 :yaml:
   :datadir: './spec/fixtures/hieradata'
 :hierarchy:
-  - '%{::clientcert}'
+  - '%{trusted.certname}'
   - 'common'