summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMukta A <mukta.aphale@clogeny.com>2013-06-06 16:01:26 +0530
committeradamedx <adamed@opscode.com>2013-06-11 09:37:52 -0700
commit8ff116e564402e7521414a5cad34e21cf7ef022f (patch)
treeb515d8d3bb847261ea17449c7a24282f0173e572
parent8a8793e702e598dc236fcffb6ea615ba72be421b (diff)
downloadchef-8ff116e564402e7521414a5cad34e21cf7ef022f.tar.gz
Changed the attribute names
-rw-r--r--lib/chef/provider/mount/windows.rb6
-rw-r--r--lib/chef/resource/mount.rb20
2 files changed, 13 insertions, 13 deletions
diff --git a/lib/chef/provider/mount/windows.rb b/lib/chef/provider/mount/windows.rb
index b0ff8123a6..02aa78919a 100644
--- a/lib/chef/provider/mount/windows.rb
+++ b/lib/chef/provider/mount/windows.rb
@@ -60,9 +60,9 @@ class Chef
def mount_fs
unless @current_resource.mounted
@mount.add(:remote => @new_resource.device,
- :username => @new_resource.auth_username,
- :domainname => @new_resource.auth_domainname,
- :password => @new_resource.auth_password)
+ :username => @new_resource.username,
+ :domainname => @new_resource.domain,
+ :password => @new_resource.password)
Chef::Log.debug("#{@new_resource} is mounted at #{@new_resource.mount_point}")
else
Chef::Log.debug("#{@new_resource} is already mounted at #{@new_resource.mount_point}")
diff --git a/lib/chef/resource/mount.rb b/lib/chef/resource/mount.rb
index 7a812556a8..ad68391fe4 100644
--- a/lib/chef/resource/mount.rb
+++ b/lib/chef/resource/mount.rb
@@ -25,7 +25,7 @@ class Chef
identity_attr :device
- state_attrs :mount_point, :device_type, :fstype, :auth_username, :auth_password, :auth_domainname
+ state_attrs :mount_point, :device_type, :fstype, :username, :password, :domain
def initialize(name, run_context=nil)
super
@@ -42,9 +42,9 @@ class Chef
@action = :mount
@supports = { :remount => false }
@allowed_actions.push(:mount, :umount, :remount, :enable, :disable)
- @auth_username = nil
- @auth_password = nil
- @auth_domainname = nil
+ @username = nil
+ @password = nil
+ @domain = nil
end
def mount_point(arg=nil)
@@ -135,25 +135,25 @@ class Chef
end
end
- def auth_username(arg=nil)
+ def username(arg=nil)
set_or_return(
- :auth_username,
+ :username,
arg,
:kind_of => [ String ]
)
end
- def auth_password(arg=nil)
+ def password(arg=nil)
set_or_return(
- :auth_password,
+ :password,
arg,
:kind_of => [ String ]
)
end
- def auth_domainname(arg=nil)
+ def domain(arg=nil)
set_or_return(
- :auth_domainname,
+ :domain,
arg,
:kind_of => [ String ]
)