Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…

…elop Conflicts: salt/modules/lxc.py
saltstack · May 19, 2015 · 8f53adb · 8f53adb
2 parents 622bda8 + 5bdbf0a
commit 8f53adb
Show file tree

Hide file tree

Showing 4 changed files with 461 additions and 79 deletions.
diff --git a/doc/topics/cloud/lxc.rst b/doc/topics/cloud/lxc.rst
@@ -10,7 +10,7 @@ and possibly remote minion.
 In other words, Salt will connect to a minion, then from that minion:
 
 - Provision and configure a container for networking access
-- Use :ref:`saltify <config_saltify>` to deploy salt and re-attach to master
+- Use **lxc** and **config** module to deploy salt and re-attach to master
 
 Limitations
 ------------
@@ -61,7 +61,18 @@ Here are the options to configure your containers:
     ``target``
         Host minion id to install the lxc Container into
     ``profile``
-        Name of the profile containing the LXC configuration
+        Name of the profile containing the LXC configuration defaults
+    ``network_profile``
+        Name of the profile containing the LXC network configuration defaults
+    ``nic_opts``
+        Per interface new-style configuration options mappings::
+
+              eth0: {'mac': '00:16:3e:01:29:40',
+                            'gateway': None, (default)
+                            'link': 'br0', (default)
+                            'gateway': None, (default)
+                            'netmask': '', (default)
+                            'ip': '22.1.4.25'}}
 
     Container creation/clone options:
         Create a container by cloning:
@@ -121,8 +132,8 @@ Here are the options to configure your containers:
 
 .. code-block:: yaml
 
-    # Note: This example would go in /etc/salt/cloud.profile or any file in the
-    # /etc/salt/cloud.profile.d/ directory.
+    # Note: This example would go in /etc/salt/cloud.profiles or any file in the
+    # /etc/salt/cloud.profiles.d/ directory.
     devhost10-lxc:
       provider: devhost10-lxc
       from_container: ubuntu
@@ -141,4 +152,4 @@ Driver Support
 
 - Container creation
 - Image listing (LXC templates)
-- Running container information (IP addresses, etc.)
+- Running container information (IP addresses, etc.)
diff --git a/salt/cloud/clouds/lxc.py b/salt/cloud/clouds/lxc.py
@@ -228,6 +228,10 @@ def _salt(fun, *args, **kw):
             if target in cret:
                 ret = cret[target]
                 break
+            # recent changes
+            elif 'data' in cret and 'outputter' in cret:
+                ret = cret['data']
+                break
             # special case, some answers may be crafted
             # to handle the unresponsivness of a specific command
             # which is also meaningful, e.g. a minion not yet provisioned

diff --git a/salt/modules/debian_ip.py b/salt/modules/debian_ip.py
@@ -596,7 +596,11 @@ def _parse_interfaces(interface_files=None):
                         iface_dict['ethtool'][attr] = valuestr
 
                     elif attr.startswith('bond'):
-                        opt = attr.split('_', 1)[1]
+                        if '-' in attr:
+                            opt = attr.split('-', 1)[1]
+                        elif '_' in attr:
+                            # Just in case configuration still has bond_
+                            opt = attr.split('_', 1)[1]
                         if 'bonding' not in iface_dict:
                             iface_dict['bonding'] = salt.utils.odict.OrderedDict()
                         iface_dict['bonding'][opt] = valuestr