Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove all trailing whitespace from custom docker options config #139

Merged
merged 1 commit into from
Jan 31, 2017

Conversation

benjamin-smith
Copy link
Contributor

Python's rstrip function calls were not stripping whitespace from the role's docker_opts option. This caused the created file at /etc/systemd/system/docker.service.d/env.conf to have an extra line, like so:

[Service]
Environment="DOCKER_OPTS=--graph=/data-01/.docker-data
"

The options were then not loaded properly by the Docker daemon.

This PR removes all whitespace from the end of the docker_opts setting, which removes the extra line (as well as any other whitespace, which should not be needed).

Local:
Python 2.7.12
ansible 2.0.1.0

Remote:
Ubuntu 16.04 on EC2
Linux ip-10-0-1-80 4.4.0-53-generic #74-Ubuntu SMP Fri Dec 2 15:59:10 UTC 2016 x86_64 x86_64 x86_64 GNU/Linux

@angstwad angstwad merged commit 396d97e into angstwad:master Jan 31, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants