mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Updates lxd_container
to support new LXD API (#7980)
* feat: ✨ adds support for /1.0/instances endpoint
* Update changelogs/fragments/lxd-instances-api-endpoint-added.yml
Co-authored-by: Felix Fontein <felix@fontein.de>
---------
Co-authored-by: Felix Fontein <felix@fontein.de>
This commit is contained in:
parent
248e2ff321
commit
74c15c1241
2 changed files with 18 additions and 9 deletions
|
@ -0,0 +1,2 @@
|
||||||
|
minor_changes:
|
||||||
|
- "lxd_container - uses ``/1.0/instances`` API endpoint, if available. Falls back to ``/1.0/containers`` or ``/1.0/virtual-machines``. Fixes issue when using Incus or LXD 5.19 due to migrating to ``/1.0/instances`` endpoint (https://github.com/ansible-collections/community.general/pull/7980)."
|
|
@ -436,12 +436,12 @@ ANSIBLE_LXD_DEFAULT_URL = 'unix:/var/lib/lxd/unix.socket'
|
||||||
|
|
||||||
# CONFIG_PARAMS is a list of config attribute names.
|
# CONFIG_PARAMS is a list of config attribute names.
|
||||||
CONFIG_PARAMS = [
|
CONFIG_PARAMS = [
|
||||||
'architecture', 'config', 'devices', 'ephemeral', 'profiles', 'source'
|
'architecture', 'config', 'devices', 'ephemeral', 'profiles', 'source', 'type'
|
||||||
]
|
]
|
||||||
|
|
||||||
# CONFIG_CREATION_PARAMS is a list of attribute names that are only applied
|
# CONFIG_CREATION_PARAMS is a list of attribute names that are only applied
|
||||||
# on instance creation.
|
# on instance creation.
|
||||||
CONFIG_CREATION_PARAMS = ['source']
|
CONFIG_CREATION_PARAMS = ['source', 'type']
|
||||||
|
|
||||||
|
|
||||||
class LXDContainerManagement(object):
|
class LXDContainerManagement(object):
|
||||||
|
@ -467,13 +467,6 @@ class LXDContainerManagement(object):
|
||||||
|
|
||||||
self.type = self.module.params['type']
|
self.type = self.module.params['type']
|
||||||
|
|
||||||
# LXD Rest API provides additional endpoints for creating containers and virtual-machines.
|
|
||||||
self.api_endpoint = None
|
|
||||||
if self.type == 'container':
|
|
||||||
self.api_endpoint = '/1.0/containers'
|
|
||||||
elif self.type == 'virtual-machine':
|
|
||||||
self.api_endpoint = '/1.0/virtual-machines'
|
|
||||||
|
|
||||||
self.key_file = self.module.params.get('client_key')
|
self.key_file = self.module.params.get('client_key')
|
||||||
if self.key_file is None:
|
if self.key_file is None:
|
||||||
self.key_file = '{0}/.config/lxc/client.key'.format(os.environ['HOME'])
|
self.key_file = '{0}/.config/lxc/client.key'.format(os.environ['HOME'])
|
||||||
|
@ -499,6 +492,18 @@ class LXDContainerManagement(object):
|
||||||
)
|
)
|
||||||
except LXDClientException as e:
|
except LXDClientException as e:
|
||||||
self.module.fail_json(msg=e.msg)
|
self.module.fail_json(msg=e.msg)
|
||||||
|
|
||||||
|
# LXD (3.19) Rest API provides instances endpoint, failback to containers and virtual-machines
|
||||||
|
# https://documentation.ubuntu.com/lxd/en/latest/rest-api/#instances-containers-and-virtual-machines
|
||||||
|
self.api_endpoint = '/1.0/instances'
|
||||||
|
check_api_endpoint = self.client.do('GET', '{0}?project='.format(self.api_endpoint), ok_error_codes=[404])
|
||||||
|
|
||||||
|
if check_api_endpoint['error_code'] == 404:
|
||||||
|
if self.type == 'container':
|
||||||
|
self.api_endpoint = '/1.0/containers'
|
||||||
|
elif self.type == 'virtual-machine':
|
||||||
|
self.api_endpoint = '/1.0/virtual-machines'
|
||||||
|
|
||||||
self.trust_password = self.module.params.get('trust_password', None)
|
self.trust_password = self.module.params.get('trust_password', None)
|
||||||
self.actions = []
|
self.actions = []
|
||||||
self.diff = {'before': {}, 'after': {}}
|
self.diff = {'before': {}, 'after': {}}
|
||||||
|
@ -551,6 +556,8 @@ class LXDContainerManagement(object):
|
||||||
url = '{0}?{1}'.format(url, urlencode(url_params))
|
url = '{0}?{1}'.format(url, urlencode(url_params))
|
||||||
config = self.config.copy()
|
config = self.config.copy()
|
||||||
config['name'] = self.name
|
config['name'] = self.name
|
||||||
|
if self.type not in self.api_endpoint:
|
||||||
|
config['type'] = self.type
|
||||||
if not self.module.check_mode:
|
if not self.module.check_mode:
|
||||||
self.client.do('POST', url, config, wait_for_container=self.wait_for_container)
|
self.client.do('POST', url, config, wait_for_container=self.wait_for_container)
|
||||||
self.actions.append('create')
|
self.actions.append('create')
|
||||||
|
|
Loading…
Reference in a new issue