From 7d1ae66f0704331842ae3a9193cdd4eae6c5ced3 Mon Sep 17 00:00:00 2001
From: Thomas S Hatch <thatch45@gmail.com>
Date: Mon, 24 Feb 2014 16:37:11 -0700
Subject: [PATCH] Converge on transport instead of salt_transport

---
 salt/config.py             | 6 +++---
 salt/transport/__init__.py | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/salt/config.py b/salt/config.py
index 551bd551bf..52c596dbb7 100644
--- a/salt/config.py
+++ b/salt/config.py
@@ -188,7 +188,7 @@ VALID_OPTS = {
     'minion_id_caching': bool,
     'sign_pub_messages': bool,
     'keysize': int,
-    'salt_transport': str,
+    'transport': str,
     'enumerate_proxy_minions': bool,
     'gather_job_timeout': int,
     'auth_timeout': int,
@@ -295,7 +295,7 @@ DEFAULT_MINION_OPTS = {
     'grains_refresh_every': 0,
     'minion_id_caching': True,
     'keysize': 4096,
-    'salt_transport': 'zeromq',
+    'transport': 'zeromq',
     'auth_timeout': 3,
     'random_master': False,
 }
@@ -413,7 +413,7 @@ DEFAULT_MASTER_OPTS = {
     'jinja_trim_blocks': False,
     'sign_pub_messages': False,
     'keysize': 4096,
-    'salt_transport': 'zeromq',
+    'transport': 'zeromq',
     'enumerate_proxy_minions': False,
     'gather_job_timeout': 2,
     'syndic_event_forward_timeout': 0.5,
diff --git a/salt/transport/__init__.py b/salt/transport/__init__.py
index 790b940ed9..c90e8db7f1 100644
--- a/salt/transport/__init__.py
+++ b/salt/transport/__init__.py
@@ -13,10 +13,10 @@ class Channel(object):
         # Default to ZeroMQ for now
         ttype = 'zeromq'
 
-        if 'transport_type' in opts:
-            ttype = opts['transport_type']
-        elif 'transport_type' in opts.get('pillar', {}).get('master', {}):
-            ttype = opts['pillar']['master']['transport_type']
+        if 'transport' in opts:
+            ttype = opts['transport']
+        elif 'transport' in opts.get('pillar', {}).get('master', {}):
+            ttype = opts['pillar']['master']['transport']
 
         if ttype == 'zeromq':
             return ZeroMQChannel(opts, **kwargs)