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

[PR #7873/13e3161f backport][stable-8] Refer to LXD containers/VMs as instances (#7891)

Browse source 
Refer to LXD containers/VMs as instances (#7873)

* plugins/connection/lxd: rename container to instance

Signed-off-by: Simon Deziel <simon.deziel@canonical.com>

* 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 <simon.deziel@canonical.com>

---------

Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
(cherry picked from commit 13e3161f2a)

Co-authored-by: Simon Deziel <simon.deziel@canonical.com>
This commit is contained in:
patchback[bot] 2024-01-24 19:49:01 +01:00 committed by GitHub
parent 145686cfe0
commit 2f5552da04
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plugins/connection/lxd.py
View file

@ -10,9 +10,9 @@ __metaclass__ = type
DOCUMENTATION = ''' DOCUMENTATION = '''
author: Matt Clay (@mattclay) <matt@mystile.com> author: Matt Clay (@mattclay) <matt@mystile.com>
name: lxd name: lxd
short_description: Run tasks in lxc containers via lxc CLI short_description: Run tasks in LXD instances via C(lxc) CLI
description: 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: options:
remote_addr: remote_addr:
description: description:
@ -26,7 +26,7 @@ DOCUMENTATION = '''
- name: ansible_lxd_host - name: ansible_lxd_host
executable: executable:
description: description:
- shell to use for execution inside container - Shell to use for execution inside instance.
default: /bin/sh default: /bin/sh
vars: vars:
- name: ansible_executable - name: ansible_executable
@ -71,7 +71,7 @@ class Connection(ConnectionBase):
raise AnsibleError("lxc command not found in PATH") raise AnsibleError("lxc command not found in PATH")
if self._play_context.remote_user is not None and self._play_context.remote_user != 'root': 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): def _host(self):
""" translate remote_addr to lxd (short) hostname """ """ translate remote_addr to lxd (short) hostname """

4
plugins/inventory/lxd.py
View file

@ -470,7 +470,7 @@ class InventoryModule(BaseInventoryPlugin):
Helper to get the preferred interface provide by neme pattern from 'prefered_instance_network_interface'. Helper to get the preferred interface provide by neme pattern from 'prefered_instance_network_interface'.
Args: Args:
str(containe_name): name of instance str(instance_name): name of instance
Kwargs: Kwargs:
None None
Raises: Raises:
@ -495,7 +495,7 @@ class InventoryModule(BaseInventoryPlugin):
Helper to get the VLAN_ID from the instance Helper to get the VLAN_ID from the instance
Args: Args:
str(containe_name): name of instance str(instance_name): name of instance
Kwargs: Kwargs:
None None
Raises: Raises: