From 6aedc1020e69d5f218b81462cfc64256e27952c9 Mon Sep 17 00:00:00 2001
From: Lars Kellogg-Stedman <lars@redhat.com>
Date: Tue, 21 Jul 2015 11:52:48 -0400
Subject: [PATCH] restore mem_limit

mem_limit got lost in the #1744; this restores it.  Thanks to @dgromov
for the report.
---
 cloud/docker/docker.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/cloud/docker/docker.py b/cloud/docker/docker.py
index e77951abf49..623cbbedc63 100644
--- a/cloud/docker/docker.py
+++ b/cloud/docker/docker.py
@@ -1359,10 +1359,16 @@ class DockerManager(object):
         return docker.utils.create_host_config(**params)
 
     def create_containers(self, count=1):
+        try:
+            mem_limit = _human_to_bytes(self.module.params.get('memory_limit'))
+        except ValueError as e:
+            self.module.fail_json(msg=str(e))
+
         params = {'image':        self.module.params.get('image'),
                   'command':      self.module.params.get('command'),
                   'ports':        self.exposed_ports,
                   'volumes':      self.volumes,
+                  'mem_limit':    mem_limit,
                   'environment':  self.env,
                   'hostname':     self.module.params.get('hostname'),
                   'domainname':   self.module.params.get('domainname'),