Fix new container initialization in LXC runner #23311
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When creating new LXC container with help of salt-cloud lxc.init crashes
with similar message:
[INFO ] Creating container(s) '['test-host']' on host 'lxc-host'
[ERROR ] Failed to create VM test-host. Configuration value 'test-host' needs to be set
Traceback (most recent call last):
File "/usr/lib/python2.7/dist-packages/salt/cloud/__init__.py", line 1193, in create
output = self.clouds[func](vm_)
File "/usr/lib/python2.7/dist-packages/salt/cloud/clouds/lxc.py", line 424, in create
cret = _runner().cmd('lxc.cloud_init', [vm_['name']], kwarg=kwarg)
File "/usr/lib/python2.7/dist-packages/salt/runner.py", line 123, in cmd
return self.functions[fun](*args, **kwargs)
File "/usr/lib/python2.7/dist-packages/salt/runners/lxc.py", line 355, in cloud_init
saltcloud_mode=True, quiet=quiet, **kwargs)
File "/usr/lib/python2.7/dist-packages/salt/runners/lxc.py", line 257, in init
kw['seed'] = seeds[name]
KeyError: 'test-host'
The reason is that salt-cloud always passes generated keys to lxc.init,
it skips seeds dictionary population and errors out trying to lookup
non-existent key.
Fix this by using fallback value of True because we always want to seed
minion in such case.
jfindlay
added a commit
that referenced
this pull request
May 4, 2015
Fix new container initialization in LXC runner
|
@jfindlay this is not the right fix i think. (should maybe be reverted) |
|
@cellscape what the full VM cloud profile options ? (minus the psswd) |
| @@ -251,7 +251,7 @@ def init(names, host=None, saltcloud_mode=False, quiet=False, **kwargs): | |||
| expr_form='list', timeout=600).get(host, {}) | |||
| name = kw.pop('name', name) | |||
| # be sure not to seed an alrady seeded host | |||
| kw['seed'] = seeds[name] | |||
| kw['seed'] = seeds.get(name, True) | |||
There was a problem hiding this comment.
s/True/seed/
And the commit will be valid.
There was a problem hiding this comment.
Oh, sorry, missed that. kwargs.get('seed', True) then. I'll prepare new pull request.
wheezy:
provider: jessie-salt-master
image: debian
release: wheezy
bridge: br0
autostart: True
start: True
gateway: |
cellscape
added a commit
to cellscape/salt
that referenced
this pull request
May 4, 2015
|
@kiorky, thanks for checking this. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When creating new LXC container with help of salt-cloud lxc.init crashes
with similar message:
The reason is that salt-cloud always passes generated keys to lxc.init,
it skips seeds dictionary population and errors out trying to lookup
non-existent key.
Fix this by using fallback value of True because we always want to seed
minion in such case.