Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move datacenter out of auth vars for manage_folder #106

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
bugfixes:
- manage_folder - Fixed the location of variables in docs to match other roles
- manage_folder - Updated datacenter var name to match other roles while keeping backwards compat
7 changes: 4 additions & 3 deletions roles/manage_folder/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,14 @@ N/A
- **manage_folder_validate_certs**
- Allows connection when SSL certificates are not valid. Set to false when certificates are not trusted.

- **manage_folder_datacenter_name**:
- The name of the datacenter in vSphere vCenter which contains the cluster to configure.

- **manage_folder_port**:
- str or int, The port used to authenticate to the vSphere vCenter that contains the cluster to configure.

### Other
- **manage_folder_datacenter**:
- The name of the datacenter in vSphere vCenter which contains the cluster to configure.
- Aliases: [manage_folder_datacenter_name]

- **manage_folder_folder_name**:
- str, required, The name of folder to manage. It can be a single name like `foo` or a path like `foo/bar/buzz`.

Expand Down
7 changes: 6 additions & 1 deletion roles/manage_folder/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
- name: Check Mandatory Variables Are Defined
ansible.builtin.assert:
that:
- manage_folder_datacenter_name is defined
- manage_folder_datacenter is defined or manage_folder_datacenter_name is defined
- manage_folder_folder_name is defined and ((manage_folder_folder_name | length) > 0)
- manage_folder_hostname is defined
- manage_folder_username is defined
Expand All @@ -15,6 +15,11 @@
msg: Folder name should not be absolute. It should be relative to /<datacenter>/<type>
when: manage_folder_folder_name[0] == '/'

- name: Map Variable Aliases to Documented Names
ansible.builtin.set_fact:
manage_folder_datacenter: "{{ manage_folder_datacenter_name }}"
when: manage_folder_datacenter_name is defined

- name: Manage Full Folder Path
when: manage_folder_parse_name_as_path
block:
Expand Down
2 changes: 1 addition & 1 deletion roles/manage_folder/tasks/manage_path_part.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
port: "{{ manage_folder_port | default(omit) }}"
proxy_host: "{{ manage_folder_proxy_host | default(omit) }}"
proxy_port: "{{ manage_folder_proxy_port | default(omit) }}"
datacenter_name: "{{ manage_folder_datacenter_name }}"
datacenter_name: "{{ manage_folder_datacenter }}"
folder_type: "{{ manage_folder_folder_type | default(omit) }}"
folder_name: "{{ _child }}"
parent_folder: "{{ _parent or omit }}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
hostname: "{{ manage_folder_hostname }}"
username: "{{ manage_folder_username }}"
password: "{{ manage_folder_password }}"
datacenter: "{{ manage_folder_datacenter_name }}"
datacenter: "{{ manage_folder_datacenter }}"
port: "{{ manage_folder_port }}"
validate_certs: false
delegate_to: localhost
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ manage_folder_username: "test"
manage_folder_password: "test"
manage_folder_validate_certs: false
manage_folder_port: "8989"
manage_folder_datacenter_name: DC0
manage_folder_datacenter: DC0
folder_types:
- host
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ manage_folder_username: "{{ vcenter_username }}"
manage_folder_password: "{{ vcenter_password }}"
manage_folder_validate_certs: false
manage_folder_port: "{{ vcenter_port }}"
manage_folder_datacenter_name: "{{ vcenter_datacenter }}"
manage_folder_datacenter: "{{ vcenter_datacenter }}"
folder_types:
- host
- vm
Expand Down
Loading