Add empty string to KOLLA_BOOTSTRAP env variable.

A change in docker-py made this fix needed, to allow to create
env variables with empty values.

Change-Id: Ife6dfc242b600fe386c02dd23d6a142b25c86567
Closes-Bug: #1554126
This commit is contained in:
Rodolfo Alonso 2016-03-08 17:27:50 +00:00 committed by Rodolfo Alonso Hernandez
parent 492ad93321
commit 241506a48d

View File

@ -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'),