openstack/kolla-ansible
Code Issues Proposed changes

Merge "Add labels to docker module"

Browse Source
This commit is contained in:
Jenkins 2016-01-29 17:41:39 +00:00 committed by Gerrit Code Review
commit 0584634bcc
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ansible/library/kolla_docker.py
View File

@ -85,6 +85,12 @@ options:
- Name of the docker image - Name of the docker image
required: False required: False
type: str type: str
labels:
description:
- List of labels to apply to container
required: False
type: dict
default: dict()
pid_mode: pid_mode:
description: description:
- Set docker pid namespace - Set docker pid namespace
@ -232,6 +238,7 @@ class DockerWorker(object):
return ( return (
self.compare_image(container_info) or self.compare_image(container_info) or
self.compare_labels(container_info) or
self.compare_privileged(container_info) or self.compare_privileged(container_info) or
self.compare_pid_mode(container_info) or self.compare_pid_mode(container_info) or
self.compare_volumes(container_info) or self.compare_volumes(container_info) or
@ -260,6 +267,20 @@ class DockerWorker(object):
if new_image['Id'] != current_image: if new_image['Id'] != current_image:
return True return True
def compare_labels(self, container_info):
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():
if k in new_labels:
if v != new_labels[k]:
return True
else:
del current_labels[k]
if new_labels != current_labels:
return True
def compare_volumes_from(self, container_info): def compare_volumes_from(self, container_info):
new_vols_from = self.params.get('volumes_from') new_vols_from = self.params.get('volumes_from')
current_vols_from = container_info['HostConfig'].get('VolumesFrom') current_vols_from = container_info['HostConfig'].get('VolumesFrom')
@ -419,6 +440,7 @@ class DockerWorker(object):
'detach': self.params.get('detach'), 'detach': self.params.get('detach'),
'environment': self.params.get('environment'), 'environment': self.params.get('environment'),
'host_config': self.build_host_config(binds), 'host_config': self.build_host_config(binds),
'labels': self.params.get('labels'),
'image': self.params.get('image'), 'image': self.params.get('image'),
'name': self.params.get('name'), 'name': self.params.get('name'),
'volumes': volumes, 'volumes': volumes,
@ -494,6 +516,7 @@ def generate_module():
auth_registry=dict(required=False, type='str'), auth_registry=dict(required=False, type='str'),
auth_username=dict(required=False, type='str'), auth_username=dict(required=False, type='str'),
detach=dict(required=False, type='bool', default=True), detach=dict(required=False, type='bool', default=True),
labels=dict(required=False, type='dict', default=dict()),
name=dict(required=False, type='str'), name=dict(required=False, type='str'),
environment=dict(required=False, type='dict'), environment=dict(required=False, type='dict'),
image=dict(required=False, type='str'), image=dict(required=False, type='str'),