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.

Sign up for GitHub

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

Jump to bottom

Keep newlines when reading LXC container config file #32219

Merged
merged 1 commit into from
Nov 14, 2017
Merged

Keep newlines when reading LXC container config file #32219

merged 1 commit into from
Nov 14, 2017

Conversation

lae
Copy link
Contributor

@lae lae commented Oct 26, 2017

SUMMARY

This fixes a regression in #30572 where newlines are stripped on the creation of LXC containers when the container_config parameter is defined, preventing LXC containers from starting.

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

modules/cloud/lxc/lxc_container.py

ANSIBLE VERSION
$ ansible --version
ansible 2.4.1.0
  config file = /home/lae/ansible-role-travis-lxc/ansible.cfg
  configured module search path = [u'/home/lae/.ansible/plugins/modules', u'/usr/share/ansible/plugins/modules']
  ansible python module location = /home/lae/travis/local/lib/python2.7/site-packages/ansible
  executable location = /home/lae/travis/bin/ansible
  python version = 2.7.6 (default, Oct 26 2016, 20:30:19) [GCC 4.8.4]
ADDITIONAL INFORMATION

See this comment: lae/ansible-role-travis-lxc#10 (comment)

@ansibot
Copy link
Contributor

ansibot commented Oct 26, 2017

cc @cloudnull
click here for bot help

@ansibot ansibot added affects_2.5 This issue/PR affects Ansible v2.5 bugfix_pull_request cloud community_review In order to be merged, this PR must follow the community review workflow. module This issue/PR relates to a module. needs_triage Needs a first human triage before being processed. new_contributor This PR is the first contribution by a new community member. support:community This issue/PR relates to code supported by the Ansible community. labels Oct 26, 2017
@nitzmahone nitzmahone removed the needs_triage Needs a first human triage before being processed. label Oct 27, 2017
daxlab
daxlab approved these changes Oct 27, 2017
View reviewed changes
Copy link

@daxlab daxlab left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah!

@ansibot ansibot added stale_ci This PR has been tested by CI more than one week ago. Close and re-open this PR to get it retested. and removed new_contributor This PR is the first contribution by a new community member. labels Nov 4, 2017
@lae
Copy link
Contributor Author

lae commented Nov 7, 2017

Can we get this merged for 2.4.2? I should point out again that this issue prevents LXC containers from starting correctly - the container processes become zombies and one needs to run lxc-stop -k to kill them.

@lae
Copy link
Contributor Author

lae commented Nov 14, 2017

@cloudnull ping

@cloudnull
Copy link
Contributor

LGTM! Thanks @lae @daxlab for the review/improvement.

@cloudnull
Copy link
Contributor

shipit

@sivel sivel merged commit 7318b7c into ansible:devel Nov 14, 2017
sivel pushed a commit that referenced this pull request Nov 14, 2017
@lae @sivel
Keep newlines when reading LXC container config file (#32219)
e2e3ab4
@sivel
Copy link
Member

sivel commented Nov 14, 2017

Merged to devel and cherry-picked to stable-2.4 for the 2.4.2 release

sivel added a commit that referenced this pull request Nov 14, 2017
@sivel
Add changelog entry for #32219
df47cf4
lae added a commit to lae/ansible-role-travis-lxc that referenced this pull request Feb 19, 2018
@lae
Remove bundled lxc_container.py as original issue is fixed (ansible/a…
3ac3e00 
…nsible#32219, #10)
@ansibot ansibot added bug This issue/PR relates to a bug. and removed bugfix_pull_request labels Mar 6, 2018
@ansible ansible locked and limited conversation to collaborators Apr 26, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@cloudnull cloudnull cloudnull approved these changes

@daxlab daxlab daxlab approved these changes

Assignees
No one assigned
Labels
affects_2.5 This issue/PR affects Ansible v2.5 bug This issue/PR relates to a bug. cloud community_review In order to be merged, this PR must follow the community review workflow. module This issue/PR relates to a module. stale_ci This PR has been tested by CI more than one week ago. Close and re-open this PR to get it retested. support:community This issue/PR relates to code supported by the Ansible community.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@lae @ansibot @cloudnull @sivel @daxlab @nitzmahone