V2 fixes

* PluginLoader class will now be more selective about loading some
  plugin classes, if a required base class is specified (used to avoid
  loading v1 plugins that have changed significantly in their apis)
* Added ability for the connection info class to read values from a
  given hosts variables, to support "magic" variables
* Added some more magic variables to the VariableManager output
* Fixed a bug in the ActionBase class, where the module configuration
  code was not correctly handling unicode

lib/ansible/executor/connection_info.py

@@ -29,6 +29,20 @@ from ansible.errors import AnsibleError
 
 __all__ = ['ConnectionInformation']
 
+# the magic variable mapping dictionary below is used to translate
+# host/inventory variables to fields in the ConnectionInformation
+# object. The dictionary values are tuples, to account for aliases
+# in variable names.
+
+MAGIC_VARIABLE_MAPPING = dict(
+   connection       = ('ansible_connection',),
+   remote_addr      = ('ansible_ssh_host', 'ansible_host'),
+   remote_user      = ('ansible_ssh_user', 'ansible_user'),
+   port             = ('ansible_ssh_port', 'ansible_port'),
+   password         = ('ansible_ssh_pass', 'ansible_password'),
+   private_key_file = ('ansible_ssh_private_key_file', 'ansible_private_key_file'),
+   shell            = ('ansible_shell_type',),
+)
 
 class ConnectionInformation:
 
@@ -51,6 +65,7 @@ class ConnectionInformation:
         self.port             = None
         self.private_key_file = C.DEFAULT_PRIVATE_KEY_FILE
         self.timeout          = C.DEFAULT_TIMEOUT
+        self.shell            = None
 
         # privilege escalation
         self.become        = None
@@ -170,7 +185,7 @@ class ConnectionInformation:
             else:
                 setattr(self, field, value)
 
-    def set_task_override(self, task):
+    def set_task_and_host_override(self, task, host):
         '''
         Sets attributes from the task if they are set, which will override
         those from the play.
@@ -179,12 +194,22 @@ class ConnectionInformation:
         new_info = ConnectionInformation()
         new_info.copy(self)
 
+        # loop through a subset of attributes on the task object and set
+        # connection fields based on their values
         for attr in ('connection', 'remote_user', 'become', 'become_user', 'become_pass', 'become_method', 'environment', 'no_log'):
             if hasattr(task, attr):
                 attr_val = getattr(task, attr)
                 if attr_val:
                     setattr(new_info, attr, attr_val)
 
+        # finally, use the MAGIC_VARIABLE_MAPPING dictionary to update this
+        # connection info object with 'magic' variables from inventory
+        variables = host.get_vars()
+        for (attr, variable_names) in MAGIC_VARIABLE_MAPPING.iteritems():
+            for variable_name in variable_names:
+                if variable_name in variables:
+                    setattr(new_info, attr, variables[variable_name])
+
         return new_info
 
     def make_become_cmd(self, cmd, executable, become_settings=None):

lib/ansible/executor/process/worker.py

@@ -111,7 +111,7 @@ class WorkerProcess(multiprocessing.Process):
                     # apply the given task's information to the connection info,
                     # which may override some fields already set by the play or
                     # the options specified on the command line
-                    new_connection_info = connection_info.set_task_override(task)
+                    new_connection_info = connection_info.set_task_and_host_override(task=task, host=host)
 
                     # execute the task and build a TaskResult from the result
                     debug("running TaskExecutor() for %s/%s" % (host, task))