Merge "Add empty string to KOLLA_BOOTSTRAP env variable."

1 files changed, 5 insertions, 1 deletions

diff --git a/ansible/library/kolla_docker.py b/ansible/library/kolla_docker.py
index 9fe84f8cb..d5bf658cf 100644
--- a/ansible/library/kolla_docker.py
+++ b/ansible/library/kolla_docker.py
@@ -458,11 +458,15 @@ class DockerWorker(object):
 
         return self.dc.create_host_config(**options)
 
+    def _format_env_vars(self):
+        env = self.params.get('environment')
+        return {k: "" if env[k] is None else env[k] for k in env}
+
     def build_container_options(self):
         volumes, binds = self.generate_volumes()
         return {
             'detach': self.params.get('detach'),
-            'environment': self.params.get('environment'),
+            'environment': self._format_env_vars(),
             'host_config': self.build_host_config(binds),
             'labels': self.params.get('labels'),
             'image': self.params.get('image'),