From 2f5552da04453f5c7c8b8a4fc9bc30bd2e8f33ba Mon Sep 17 00:00:00 2001 From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com> Date: Wed, 24 Jan 2024 19:49:01 +0100 Subject: [PATCH] [PR #7873/13e3161f backport][stable-8] Refer to LXD containers/VMs as instances (#7891) Refer to LXD containers/VMs as instances (#7873) * plugins/connection/lxd: rename container to instance Signed-off-by: Simon Deziel * plugins/inventory/lxd: rename container to instance It seems that a previous search and replace was done but it missed those `containe_name` due to missing `r` in `container`. Signed-off-by: Simon Deziel --------- Signed-off-by: Simon Deziel (cherry picked from commit 13e3161f2ae24f851724fa3740907b32d4c8e3c2) Co-authored-by: Simon Deziel --- plugins/connection/lxd.py | 8 ++++---- plugins/inventory/lxd.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/connection/lxd.py b/plugins/connection/lxd.py index 93e1ab7a46..0e784b85fd 100644 --- a/plugins/connection/lxd.py +++ b/plugins/connection/lxd.py @@ -10,9 +10,9 @@ __metaclass__ = type DOCUMENTATION = ''' author: Matt Clay (@mattclay) name: lxd - short_description: Run tasks in lxc containers via lxc CLI + short_description: Run tasks in LXD instances via C(lxc) CLI description: - - Run commands or put/fetch files to an existing lxc container using lxc CLI + - Run commands or put/fetch files to an existing instance using C(lxc) CLI. options: remote_addr: description: @@ -26,7 +26,7 @@ DOCUMENTATION = ''' - name: ansible_lxd_host executable: description: - - shell to use for execution inside container + - Shell to use for execution inside instance. default: /bin/sh vars: - name: ansible_executable @@ -71,7 +71,7 @@ class Connection(ConnectionBase): raise AnsibleError("lxc command not found in PATH") if self._play_context.remote_user is not None and self._play_context.remote_user != 'root': - self._display.warning('lxd does not support remote_user, using container default: root') + self._display.warning('lxd does not support remote_user, using default: root') def _host(self): """ translate remote_addr to lxd (short) hostname """ diff --git a/plugins/inventory/lxd.py b/plugins/inventory/lxd.py index 1539d000ab..5b855fc97e 100644 --- a/plugins/inventory/lxd.py +++ b/plugins/inventory/lxd.py @@ -470,7 +470,7 @@ class InventoryModule(BaseInventoryPlugin): Helper to get the preferred interface provide by neme pattern from 'prefered_instance_network_interface'. Args: - str(containe_name): name of instance + str(instance_name): name of instance Kwargs: None Raises: @@ -495,7 +495,7 @@ class InventoryModule(BaseInventoryPlugin): Helper to get the VLAN_ID from the instance Args: - str(containe_name): name of instance + str(instance_name): name of instance Kwargs: None Raises: