5 files changed, 14 insertions, 22 deletions
diff --git a/acceptance/tests/resource/service/ticket_4123_should_list_all_running_redhat.rb b/acceptance/tests/resource/service/ticket_4123_should_list_all_running_redhat.rb
index b4c2bc14d..9bedd6e04 100755
--- a/acceptance/tests/resource/service/ticket_4123_should_list_all_running_redhat.rb
+++ b/acceptance/tests/resource/service/ticket_4123_should_list_all_running_redhat.rb
@@ -7,6 +7,6 @@ hosts.each do |host|
   unless host['platform'].include? 'centos' or host['platform'].include? 'redhat'
     skip_test "Test not supported on this plaform" 
   else
-    run_script_on(host,'tests/acceptance/resource/service/ticket_4123_should_list_all_running_redhat.sh')
+    run_script_on(host,'acceptance-tests/tests/resource/service/ticket_4123_should_list_all_running_redhat.sh')
   end
 end
diff --git a/acceptance/tests/resource/service/ticket_4124_should_list_all_disabled.rb b/acceptance/tests/resource/service/ticket_4124_should_list_all_disabled.rb
index 4add108ff..db96ad91c 100755
--- a/acceptance/tests/resource/service/ticket_4124_should_list_all_disabled.rb
+++ b/acceptance/tests/resource/service/ticket_4124_should_list_all_disabled.rb
@@ -7,6 +7,6 @@ hosts.each do |host|
   unless host['platform'].include? 'centos' or host['platform'].include? 'redhat'
     skip_test "Test not supported on this plaform"
    else
-    run_script_on(host,'tests/acceptance/resource/service/ticket_4124_should_list_all_disabled.sh')
+    run_script_on(host,'acceptance-tests/tests/resource/service/ticket_4124_should_list_all_disabled.sh')
   end
 end
diff --git a/lib/puppet/application/secret_agent.rb b/lib/puppet/application/secret_agent.rb
index d704d14b2..6bdbc9232 100644
--- a/lib/puppet/application/secret_agent.rb
+++ b/lib/puppet/application/secret_agent.rb
@@ -1,23 +1,6 @@
-require 'puppet/application'
+require 'puppet/application/face_base'
 require 'puppet/face'
 
-class Puppet::Application::Secret_agent < Puppet::Application
-  should_parse_config
+class Puppet::Application::Secret_agent < Puppet::Application::FaceBase
   run_mode :agent
-
-  option("--debug", "-d")
-  option("--verbose", "-v")
-
-  def setup
-    if options[:debug] or options[:verbose]
-      Puppet::Util::Log.level = options[:debug] ? :debug : :info
-    end
-
-    Puppet::Util::Log.newdestination(:console)
-  end
-
-  def run_command
-    report = Puppet::Face[:secret_agent, '0.0.1'].synchronize(Puppet[:certname])
-    Puppet::Face[:report, '0.0.1'].submit(report)
-  end
 end
diff --git a/lib/puppet/face/secret_agent.rb b/lib/puppet/face/secret_agent.rb
index 105850cd3..79241da72 100644
--- a/lib/puppet/face/secret_agent.rb
+++ b/lib/puppet/face/secret_agent.rb
@@ -15,6 +15,7 @@ Puppet::Face.define(:secret_agent, '0.0.1') do
   EOT
 
   action(:synchronize) do
+    default
     summary "Run secret_agent once."
     arguments "[-v | --verbose] [-d | --debug]" # Remove this once options are introspectible
     description <<-'EOT'
diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb
index 1dbf12451..558491a7f 100644
--- a/lib/puppet/type.rb
+++ b/lib/puppet/type.rb
@@ -876,6 +876,12 @@ class Type
     # Put the default provider first, then the rest of the suitable providers.
     provider_instances = {}
     providers_by_source.collect do |provider|
+      all_properties = self.properties.find_all do |property|
+        provider.supports_parameter?(property)
+      end.collect do |property|
+        property.name
+      end
+
       provider.instances.collect do |instance|
         # We always want to use the "first" provider instance we find, unless the resource
         # is already managed and has a different provider set
@@ -886,7 +892,9 @@ class Type
         end
         provider_instances[instance.name] = instance
 
-        new(:name => instance.name, :provider => instance, :audit => :all)
+        result = new(:name => instance.name, :provider => instance)
+        properties.each { |name| result.newattr(name) }
+        result
       end
     end.flatten.compact
   end