openstack/kolla-ansible
Code Issues Proposed changes

Merge "Add empty string to KOLLA_BOOTSTRAP env variable."

Browse Source
This commit is contained in:
Jenkins 2016-03-09 16:29:00 +00:00 committed by Gerrit Code Review
commit 6423b4c575
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/library/kolla_docker.py
View File

@ -458,11 +458,15 @@ class DockerWorker(object):
return self.dc.create_host_config(**options) 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): def build_container_options(self):
volumes, binds = self.generate_volumes() volumes, binds = self.generate_volumes()
return { return {
'detach': self.params.get('detach'), 'detach': self.params.get('detach'),
'environment': self.params.get('environment'), 'environment': self._format_env_vars(),
'host_config': self.build_host_config(binds), 'host_config': self.build_host_config(binds),
'labels': self.params.get('labels'), 'labels': self.params.get('labels'),
'image': self.params.get('image'), 'image': self.params.get('image'),