Browse Source

(#12094) Replace name with path in file resources

When the name is used with a file resource, it becomes difficult to test the
resource using rspec-puppet, as the name parameter gets aliased to path. So to
maintain consistency between tests and manifests, this replaces all name
parameters in file resources with the equivalent path parameter.
Matthaus Litteken 12 năm trước cách đây
mục cha
commit
0fb5f78
3 tập tin đã thay đổi với 4 bổ sung4 xóa
  1. 2 2
      manifests/init.pp
  2. 1 1
      manifests/pin.pp
  3. 1 1
      manifests/source.pp

+ 2 - 2
manifests/init.pp

@@ -29,7 +29,7 @@ class apt(
   package { "python-software-properties": }
 
   file { "sources.list":
-    name => "${apt::params::root}/sources.list",
+    path => "${apt::params::root}/sources.list",
     ensure => present,
     owner => root,
     group => root,
@@ -37,7 +37,7 @@ class apt(
   }
 
   file { "sources.list.d":
-    name => "${apt::params::root}/sources.list.d",
+    path => "${apt::params::root}/sources.list.d",
     ensure => directory,
     owner => root,
     group => root,

+ 1 - 1
manifests/pin.pp

@@ -9,7 +9,7 @@ define apt::pin(
   include apt::params
 
   file { "${name}.pref":
-    name => "${apt::params::root}/preferences.d/${name}",
+    path => "${apt::params::root}/preferences.d/${name}",
     ensure => file,
     owner => root,
     group => root,

+ 1 - 1
manifests/source.pp

@@ -17,7 +17,7 @@ define apt::source(
 
 
   file { "${name}.list":
-    name => "${apt::params::root}/sources.list.d/${name}.list",
+    path => "${apt::params::root}/sources.list.d/${name}.list",
     ensure => file,
     owner => root,
     group => root,