Skip to content

Commit

Permalink
#8440 Allow for API Port to be specified when using proxmox_kvm (#8441)
Browse files Browse the repository at this point in the history
* added api_port

* added changelog fragments for #8440

* api_port minor changes

- Added documentation on api_port
- Fixed multiple spaces after operator
- Switched from str to int

* Update changelogs/fragments/8440-allow-api-port-specification.yaml

Co-authored-by: Felix Fontein <[email protected]>

* Update changelogs/fragments/8440-allow-api-port-specification.yaml

Co-authored-by: Felix Fontein <[email protected]>

* Update plugins/doc_fragments/proxmox.py

Co-authored-by: Felix Fontein <[email protected]>

* Update plugins/doc_fragments/proxmox.py

Co-authored-by: Felix Fontein <[email protected]>

---------

Co-authored-by: Felix Fontein <[email protected]>
  • Loading branch information
tgouverneur and felixfontein authored Jun 8, 2024
1 parent 06f13e7 commit d2d7deb
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 0 deletions.
2 changes: 2 additions & 0 deletions changelogs/fragments/8440-allow-api-port-specification.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
minor_changes:
- proxmox - allow specification of the API port when using proxmox_* (https://github.com/ansible-collections/community.general/issues/8440, https://github.com/ansible-collections/community.general/pull/8441).
7 changes: 7 additions & 0 deletions plugins/doc_fragments/proxmox.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@ class ModuleDocFragment(object):
- Specify the target host of the Proxmox VE cluster.
type: str
required: true
api_port:
description:
- Specify the target port of the Proxmox VE cluster.
- Uses the E(PROXMOX_PORT) environment variable if not specified.
type: int
required: false
version_added: 9.1.0
api_user:
description:
- Specify the user to authenticate with.
Expand Down
8 changes: 8 additions & 0 deletions plugins/module_utils/proxmox.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ def proxmox_auth_argument_spec():
required=True,
fallback=(env_fallback, ['PROXMOX_HOST'])
),
api_port=dict(type='int',
fallback=(env_fallback, ['PROXMOX_PORT'])
),
api_user=dict(type='str',
required=True,
fallback=(env_fallback, ['PROXMOX_USER'])
Expand Down Expand Up @@ -82,13 +85,18 @@ def __init__(self, module):

def _connect(self):
api_host = self.module.params['api_host']
api_port = self.module.params['api_port']
api_user = self.module.params['api_user']
api_password = self.module.params['api_password']
api_token_id = self.module.params['api_token_id']
api_token_secret = self.module.params['api_token_secret']
validate_certs = self.module.params['validate_certs']

auth_args = {'user': api_user}

if api_port:
auth_args['port'] = api_port

if api_password:
auth_args['password'] = api_password
else:
Expand Down

0 comments on commit d2d7deb

Please sign in to comment.