Merge pull request #1299 from ekohl/inline-files

Inline file contents in the catalog

Author: david22swan

manifests/client.pp

@@ -26,10 +26,10 @@
   }
 
   file { $validcon_script_path:
-    ensure => $file_ensure,
-    source => 'puppet:///modules/postgresql/validate_postgresql_connection.sh',
-    owner  => 0,
-    group  => 0,
-    mode   => '0755',
+    ensure  => $file_ensure,
+    content => file('postgresql/validate_postgresql_connection.sh'),
+    owner   => 0,
+    group   => 0,
+    mode    => '0755',
   }
 }

manifests/repo/yum_postgresql_org.pp

@@ -5,11 +5,11 @@
   $gpg_key_path    = "/etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG-${package_version}"
 
   file { $gpg_key_path:
-    source => 'puppet:///modules/postgresql/RPM-GPG-KEY-PGDG',
-    owner  => 'root',
-    group  => 'root',
-    mode   => '0644',
-    before => Yumrepo['yum.postgresql.org'],
+    content => file('postgresql/RPM-GPG-KEY-PGDG'),
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0644',
+    before  => Yumrepo['yum.postgresql.org'],
   }
 
   if($facts['os']['name'] == 'Fedora') {