diff options
| author | Rodolfo Alonso <rodolfo.alonso.hernandez@intel.com> | 2016-03-08 17:27:50 +0000 |
|---|---|---|
| committer | Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com> | 2016-03-09 13:58:38 +0000 |
| commit | 241506a48dc2dc0f20bce0feafe67c95b0d2bbf0 (patch) | |
| tree | edc2632832ce1237e540e6bdf415fbd913f71e0a | |
| parent | 492ad93321f0ec7461d1661582520b8bc1ec9d00 (diff) | |
| download | kolla-241506a48dc2dc0f20bce0feafe67c95b0d2bbf0.tar.gz kolla-241506a48dc2dc0f20bce0feafe67c95b0d2bbf0.zip | |
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
| -rw-r--r-- | ansible/library/kolla_docker.py | 6 |
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'), |