From 0fb5f78379ef167d30770d14d6fee2b6787eeadd Mon Sep 17 00:00:00 2001 From: Matthaus Litteken Date: Mon, 23 Jan 2012 13:05:59 -0800 Subject: [PATCH] (#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. --- manifests/init.pp | 4 ++-- manifests/pin.pp | 2 +- manifests/source.pp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 8042c8b..59a56e3 100644 --- a/manifests/init.pp +++ b/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, diff --git a/manifests/pin.pp b/manifests/pin.pp index 3485b24..40695af 100644 --- a/manifests/pin.pp +++ b/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, diff --git a/manifests/source.pp b/manifests/source.pp index 65afefd..9f040b7 100644 --- a/manifests/source.pp +++ b/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, -- 2.45.2