From 3a5dd0007634c9d4e379f20cac77c8fd64b67f42 Mon Sep 17 00:00:00 2001 From: chouseknecht Date: Thu, 12 May 2016 05:31:10 -0400 Subject: [PATCH] Fixed files/project_files naming. Correct name is files. --- cloud/docker/docker_service.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/cloud/docker/docker_service.py b/cloud/docker/docker_service.py index 8b4da6d4765..d0d6e2630b3 100644 --- a/cloud/docker/docker_service.py +++ b/cloud/docker/docker_service.py @@ -85,7 +85,7 @@ options: definition: description: - Provide docker-compose yaml describing one or more services, networks and volumes. - - Mutually exclusive with project_src and project_files + - Mutually exclusive with C(project_src) and C(project_files). type: complex required: false hostname_check: @@ -430,7 +430,7 @@ class ContainerManager(DockerBaseClass): self.client = client self.project_src = None - self.project_files = None + self.files = None self.project_name = None self.state = None self.definition = None @@ -463,8 +463,8 @@ class ContainerManager(DockerBaseClass): if self.project_name: self.options[u'--project-name'] = self.project_name - if self.project_files: - self.options[u'--file'] = self.project_files + if self.files: + self.options[u'--file'] = self.files if not HAS_COMPOSE: self.client.fail("Unable to load docker-compose. Try `pip install docker-compose`. Error: %s" % HAS_COMPOSE_EXC) @@ -734,7 +734,6 @@ def main(): ) mutually_exclusive = [ - ('force_recreate', 'no_recreate'), ('definition', 'project_src'), ('definition', 'files') ]