diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-07-26 17:49:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-07-26 17:49:28 +0000 |
| commit | 4f3c213cbfcb2bc1097303e9a84c0e01f7676124 (patch) | |
| tree | 75a2a8c1b43323d1f97a4efc069542000ce89b58 | |
| parent | 27e7f4bc5d18191cf59edd8b80ce142a3c3abfa0 (diff) | |
| parent | 1bddef94cb93551e9ddd5769bf356c9cebdc33e8 (diff) | |
| download | kolla-4f3c213cbfcb2bc1097303e9a84c0e01f7676124.tar.gz kolla-4f3c213cbfcb2bc1097303e9a84c0e01f7676124.zip | |
Merge "Python 3: dict.iteritems()"
| -rw-r--r-- | ansible/library/kolla_docker.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ansible/library/kolla_docker.py b/ansible/library/kolla_docker.py index d388ca721..dc542aece 100644 --- a/ansible/library/kolla_docker.py +++ b/ansible/library/kolla_docker.py @@ -341,7 +341,7 @@ class DockerWorker(object): new_labels = self.params.get('labels') current_labels = container_info['Config'].get('Labels', dict()) image_labels = self.check_image().get('Labels', dict()) - for k, v in image_labels.iteritems(): + for k, v in image_labels.items(): if k in new_labels: if v != new_labels[k]: return True @@ -378,7 +378,7 @@ class DockerWorker(object): new_binds = list() if binds: - for k, v in binds.iteritems(): + for k, v in binds.items(): new_binds.append("{}:{}:{}".format(k, v['bind'], v['mode'])) if set(new_binds).symmetric_difference(set(current_binds)): @@ -391,7 +391,7 @@ class DockerWorker(object): k, v = kv.split('=', 1) current_env.update({k: v}) - for k, v in self.params.get('environment').iteritems(): + for k, v in self.params.get('environment').items(): if k not in current_env: return True if current_env[k] != v: @@ -699,7 +699,7 @@ def generate_module(): if env: new_args['environment'].update(env) - for key, value in module.params.iteritems(): + for key, value in module.params.items(): if key in new_args and value is None: continue new_args[key] = value |
