ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Update lxd connection to use all documented vars for options (#3798) (#3880)

Browse source 
* Update lxd connection to use documented vars

* Add a changelog fragment

* Add clarification to changelog description

* Shorten changelog fragment description

(cherry picked from commit 8f6866dba6)

Co-authored-by: Conner Crosby <conner@cavcrosby.tech>
This commit is contained in:
patchback[bot] 2021-12-09 21:58:02 +01:00 committed by GitHub
parent 587d221376
commit 2086977af6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
changelogs/fragments/3798-fix-lxd-connection-option-vars-support.yml Normal file
View file

@ -0,0 +1,4 @@
---
minor_changes:
- lxd connection plugin - make sure that ``ansible_lxd_host``, ``ansible_executable``, and
``ansible_lxd_executable`` work (https://github.com/ansible-collections/community.general/pull/3798).

8
plugins/connection/lxd.py
View file

@ -89,9 +89,9 @@ class Connection(ConnectionBase):
local_cmd.extend(["--project", self.get_option("project")]) local_cmd.extend(["--project", self.get_option("project")])
local_cmd.extend([ local_cmd.extend([
"exec", "exec",
"%s:%s" % (self.get_option("remote"), self._host), "%s:%s" % (self.get_option("remote"), self.get_option("remote_addr")),
"--", "--",
self._play_context.executable, "-c", cmd self.get_option("executable"), "-c", cmd
]) ])
local_cmd = [to_bytes(i, errors='surrogate_or_strict') for i in local_cmd] local_cmd = [to_bytes(i, errors='surrogate_or_strict') for i in local_cmd]
@ -126,7 +126,7 @@ class Connection(ConnectionBase):
local_cmd.extend([ local_cmd.extend([
"file", "push", "file", "push",
in_path, in_path,
"%s:%s/%s" % (self.get_option("remote"), self._host, out_path) "%s:%s/%s" % (self.get_option("remote"), self.get_option("remote_addr"), out_path)
]) ])
local_cmd = [to_bytes(i, errors='surrogate_or_strict') for i in local_cmd] local_cmd = [to_bytes(i, errors='surrogate_or_strict') for i in local_cmd]
@ -145,7 +145,7 @@ class Connection(ConnectionBase):
local_cmd.extend(["--project", self.get_option("project")]) local_cmd.extend(["--project", self.get_option("project")])
local_cmd.extend([ local_cmd.extend([
"file", "pull", "file", "pull",
"%s:%s/%s" % (self.get_option("remote"), self._host, in_path), "%s:%s/%s" % (self.get_option("remote"), self.get_option("remote_addr"), in_path),
out_path out_path
]) ])