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.

Sign up for GitHub

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

Jump to bottom

vultr_server: fix idempotency for private network and IPv6 options #55619

Merged
merged 2 commits into from Apr 23, 2019
+18 −9
Merged

vultr_server: fix idempotency for private network and IPv6 options #55619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9666e79
vultr_server: fix idempotency for private network and IPv6 options
resmo Apr 22, 2019
9836067
add changelog
resmo Apr 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/55619-vultr_server_idempotency.yml
View file
Open in desktop
@@ -0,0 +1,2 @@
bugfixes:
- vultr_server - Fix idempotency for options ``ipv6_enabled`` and ``private_network_enabled``.
10 changes: 5 additions & 5 deletions lib/ansible/module_utils/vultr.py
View file
Open in desktop
Expand Up @@ -128,15 +128,15 @@ def switch_enable_disable(self, resource, param_key, resource_key=None):
return

r_value = resource.get(resource_key)
if isinstance(param, bool):
if param is True and r_value not in ['yes', 'enable']:
if r_value in ['yes', 'no']:
if param and r_value != 'yes':
return "enable"
elif param is False and r_value not in ['no', 'disable']:
elif not param and r_value != 'no':
return "disable"
else:
if r_value is None:
if param and not r_value:
return "enable"
else:
elif not param and r_value:
return "disable"

def api_query(self, path="/", method="GET", data=None):
Expand Down
15 changes: 11 additions & 4 deletions test/integration/targets/vultr_server/tasks/main.yml
View file
Open in desktop
Expand Up @@ -313,6 +313,7 @@
os: CentOS 6 x64
plan: "{{ vultr_server_plan_2 }}"
auto_backup_enabled: yes
private_network_enabled: yes
region: Amsterdam
force: yes
register: result
Expand All @@ -327,13 +328,15 @@
- result.vultr_server.plan == vultr_server_plan_1
- result.vultr_server.region == 'Amsterdam'
- result.vultr_server.auto_backup_enabled == false
- result.vultr_server.internal_ip == ''

- name: test update server with force
vultr_server:
name: "{{ vultr_server_name }}"
os: CentOS 6 x64
plan: "{{ vultr_server_plan_2 }}"
auto_backup_enabled: yes
private_network_enabled: yes
region: Amsterdam
force: yes
register: result
Expand All @@ -347,15 +350,17 @@
- result.vultr_server.plan == vultr_server_plan_2
- result.vultr_server.region == 'Amsterdam'
- result.vultr_server.auto_backup_enabled == true
- result.vultr_server.internal_ip != ''

- name: test update server idempotence with force
vultr_server:
name: "{{ vultr_server_name }}"
os: CentOS 6 x64
plan: "{{ vultr_server_plan_2 }}"
auto_backup_enabled: true
auto_backup_enabled: yes
private_network_enabled: yes
region: Amsterdam
force: true
force: yes
register: result
- name: verify test update server idempotence with force
assert:
Expand All @@ -367,13 +372,14 @@
- result.vultr_server.plan == vultr_server_plan_2
- result.vultr_server.region == 'Amsterdam'
- result.vultr_server.auto_backup_enabled == true
- result.vultr_server.internal_ip != ''

- name: test update server to stopped in check mode
vultr_server:
name: "{{ vultr_server_name }}"
os: CentOS 6 x64
plan: "{{ vultr_server_plan_2 }}"
ipv6_enabled: true
ipv6_enabled: yes
region: Amsterdam
state: stopped
register: result
Expand All @@ -394,7 +400,7 @@
name: "{{ vultr_server_name }}"
os: CentOS 6 x64
plan: "{{ vultr_server_plan_2 }}"
ipv6_enabled: true
ipv6_enabled: yes
region: Amsterdam
state: stopped
register: result
Expand All @@ -414,6 +420,7 @@
name: "{{ vultr_server_name }}"
os: CentOS 6 x64
plan: "{{ vultr_server_plan_2 }}"
ipv6_enabled: yes
region: Amsterdam
state: stopped
register: result
Expand Down