cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix for issue #3775 - env config comparison

Browse source
This commit is contained in:
chouseknecht 2016-05-29 09:19:54 -04:00 committed by Matt Clay
parent 65e71d8960
commit bc665fca9c
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/ansible/modules/cloud/docker/docker_container.py
View file

@ -1273,10 +1273,15 @@ class Container(DockerBaseClass):
def _get_expected_env(self, image): def _get_expected_env(self, image):
self.log('_get_expected_env') self.log('_get_expected_env')
param_env = (self._convert_simple_dict_to_list('env', '=') or []) expected_env = dict()
if image and image['ContainerConfig'].get('Env'): if image and image['ContainerConfig'].get('Env'):
image_env = image['ContainerConfig'].get('Env') for env_var in image['ContainerConfig']['Env']:
param_env = list(set(param_env + image_env)) parts = env_var.split('=')
expected_env[parts[0]] = parts[1]
expected_env.update(self.parameters.env)
param_env = []
for key, value in expected_env.items():
param_env.append("%s=%s" % (key, value))
return param_env return param_env
def _get_expected_exposed(self, image): def _get_expected_exposed(self, image):