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

Removed use of --diff. Replaced 'diff' in output with 'actions'. Only show 'actions' in output if debug true.

Browse source
This commit is contained in:
chouseknecht 2016-05-11 15:01:29 -04:00
parent f69b352341
commit c2d2189274
No known key found for this signature in database
GPG key ID: 78F1698C5705A81B
1 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
cloud/docker/docker_service.py
View file

@ -32,7 +32,7 @@ description:
- Works with compose versions 1 and 2. - Works with compose versions 1 and 2.
- Compose can be read from a docker-compose.yml (or .yaml) file or inline using the C(definition) option. - Compose can be read from a docker-compose.yml (or .yaml) file or inline using the C(definition) option.
- See the examples for more details. - See the examples for more details.
- Supports check mode and differences. - Supports check mode.
options: options:
project_src: project_src:
@ -411,15 +411,15 @@ class ContainerManager(DockerBaseClass):
self.dependencies = None self.dependencies = None
self.services = None self.services = None
self.scale = None self.scale = None
self.diff = None self.debug = None
for key, value in client.module.params.items(): for key, value in client.module.params.items():
setattr(self, key, value) setattr(self, key, value)
self.check_mode = client.check_mode self.check_mode = client.check_mode
if not self.diff: if not self.debug:
self.diff = client.module._diff self.debug = client.module._debug
self.options = dict() self.options = dict()
self.options.update(self._get_auth_options()) self.options.update(self._get_auth_options())
@ -461,7 +461,7 @@ class ContainerManager(DockerBaseClass):
self.client.fail("Configuration error - %s" % str(exc)) self.client.fail("Configuration error - %s" % str(exc))
def exec_module(self): def exec_module(self):
result = None result = dict()
if self.state == 'present': if self.state == 'present':
result = self.cmd_up() result = self.cmd_up()
@ -491,7 +491,7 @@ class ContainerManager(DockerBaseClass):
start_deps = self.dependencies start_deps = self.dependencies
service_names = self.services service_names = self.services
detached = True detached = True
result = dict(changed=False, diff=dict(), ansible_facts=dict()) result = dict(changed=False, actions=dict(), ansible_facts=dict())
up_options = { up_options = {
u'--no-recreate': False, u'--no-recreate': False,
@ -517,11 +517,11 @@ class ContainerManager(DockerBaseClass):
plan = service.convergence_plan(strategy=converge) plan = service.convergence_plan(strategy=converge)
if plan.action != 'noop': if plan.action != 'noop':
result['changed'] = True result['changed'] = True
if self.diff: if self.debug:
result['diff'][service.name] = dict() result['actions'][service.name] = dict()
result['diff'][service.name][plan.action] = [] result['actions'][service.name][plan.action] = []
for container in plan.containers: for container in plan.containers:
result['diff'][service.name][plan.action].append(dict( result['actions'][service.name][plan.action].append(dict(
id=container.id, id=container.id,
name=container.name, name=container.name,
short_id=container.short_id, short_id=container.short_id,
@ -579,16 +579,16 @@ class ContainerManager(DockerBaseClass):
def cmd_down(self): def cmd_down(self):
result = dict( result = dict(
changed=False, changed=False,
diff=dict(), actions=dict(),
) )
for service in self.project.services: for service in self.project.services:
containers = service.containers(stopped=True) containers = service.containers(stopped=True)
if len(containers): if len(containers):
result['changed'] = True result['changed'] = True
if self.diff: if self.debug:
result['diff'][service.name] = dict() result['actions'][service.name] = dict()
result['diff'][service.name]['deleted'] = [container.name for container in containers] result['actions'][service.name]['deleted'] = [container.name for container in containers]
if not self.check_mode and result['changed']: if not self.check_mode and result['changed']:
image_type = image_type_from_opt('--rmi', self.remove_images) image_type = image_type_from_opt('--rmi', self.remove_images)
@ -602,16 +602,16 @@ class ContainerManager(DockerBaseClass):
def cmd_stop(self, service_names): def cmd_stop(self, service_names):
result = dict( result = dict(
changed=False, changed=False,
diff=dict() actions=dict()
) )
for service in self.project.services: for service in self.project.services:
if not service_names or service.name in service_names: if not service_names or service.name in service_names:
result['diff'][service.name] = dict() result['actions'][service.name] = dict()
result['diff'][service.name]['stop'] = [] result['actions'][service.name]['stop'] = []
for container in service.containers(stopped=False): for container in service.containers(stopped=False):
result['changed'] = True result['changed'] = True
if self.diff: if self.debug:
result['diff'][service.name]['stop'].append(dict( result['actions'][service.name]['stop'].append(dict(
id=container.id, id=container.id,
name=container.name, name=container.name,
short_id=container.short_id, short_id=container.short_id,
@ -628,17 +628,17 @@ class ContainerManager(DockerBaseClass):
def cmd_restart(self, service_names): def cmd_restart(self, service_names):
result = dict( result = dict(
changed=False, changed=False,
diff=dict() actions=dict()
) )
for service in self.project.services: for service in self.project.services:
if not service_names or service.name in service_names: if not service_names or service.name in service_names:
result['diff'][service.name] = dict() result['actions'][service.name] = dict()
result['diff'][service.name]['restart'] = [] result['actions'][service.name]['restart'] = []
for container in service.containers(stopped=True): for container in service.containers(stopped=True):
result['changed'] = True result['changed'] = True
if self.diff: if self.debug:
result['diff'][service.name]['restart'].append(dict( result['actions'][service.name]['restart'].append(dict(
id=container.id, id=container.id,
name=container.name, name=container.name,
short_id=container.short_id, short_id=container.short_id,
@ -655,17 +655,17 @@ class ContainerManager(DockerBaseClass):
def cmd_scale(self): def cmd_scale(self):
result = dict( result = dict(
changed=False, changed=False,
diff=dict() actions=dict()
) )
for service in self.project.services: for service in self.project.services:
if service.name in self.scale: if service.name in self.scale:
result['diff'][service.name] = dict() result['actions'][service.name] = dict()
containers = service.containers(stopped=True) containers = service.containers(stopped=True)
if len(containers) != self.scale[service.name]: if len(containers) != self.scale[service.name]:
result['changed'] = True result['changed'] = True
if self.diff: if self.debug:
result['diff'][service.name]['scale'] = self.scale[service.name] - len(containers) result['actions'][service.name]['scale'] = self.scale[service.name] - len(containers)
if not self.check_mode: if not self.check_mode:
try: try:
service.scale(self.scale[service.name]) service.scale(self.scale[service.name])
@ -692,7 +692,7 @@ def main():
scale=dict(type='dict'), scale=dict(type='dict'),
services=dict(type='list'), services=dict(type='list'),
dependencies=dict(type='bool', default=True), dependencies=dict(type='bool', default=True),
diff=dict(type='bool', default=False) debug=dict(type='bool', default=False)
) )
mutually_exclusive = [ mutually_exclusive = [