Skip to content

instance: add wait_for_state != locked before update #132

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

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

instance: add wait_for_state != locked before update #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
16c0638
instance: add wait_for_state != locked before update
resmo Dec 2, 2024
361d948
try out rm vpc first
resmo Dec 2, 2024
ab44270
user: comply with password policy
resmo Dec 2, 2024
022ce27
ignore erorrs on cleanup all
resmo Dec 2, 2024
3c91bd6
wait for not installbooting
resmo Dec 2, 2024
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
11 changes: 11 additions & 0 deletions plugins/modules/instance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,17 @@ def create_or_update(self):

return resource

def update(self, resource):
if not self.module.check_mode:
resource = self.wait_for_state(
resource=resource,
key="server_status",
states=["none", "locked"],
cmp="!=",
skip_wait=self.module.params.get("skip_wait", False),
)
return super(AnsibleVultrInstance, self).update(resource)

def configure(self):
super(AnsibleVultrInstance, self).configure()

Expand Down
17 changes: 17 additions & 0 deletions tests/integration/targets/cleanup/tasks/cleanup_all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,33 @@
- debug:
msg: Cleaning up resources with prefix {{ vultr_resource_prefix }}

- ansible.builtin.import_tasks: cleanup_vpc.yml
ignore_errors: true
- ansible.builtin.import_tasks: cleanup_vpc2.yml
ignore_errors: true
- ansible.builtin.import_tasks: cleanup_instance.yml
ignore_errors: true
- ansible.builtin.import_tasks: cleanup_bare_metal.yml
ignore_errors: true
- ansible.builtin.import_tasks: cleanup_ssh_key.yml
ignore_errors: true
- ansible.builtin.import_tasks: cleanup_vpc.yml
ignore_errors: true
- ansible.builtin.import_tasks: cleanup_vpc2.yml
ignore_errors: true
- ansible.builtin.import_tasks: cleanup_firewall_group.yml
ignore_errors: true
- ansible.builtin.import_tasks: cleanup_snapshot.yml
ignore_errors: true
- ansible.builtin.import_tasks: cleanup_user.yml
ignore_errors: true
- ansible.builtin.import_tasks: cleanup_dns_domain.yml
ignore_errors: true
- ansible.builtin.import_tasks: cleanup_block_storage.yml
ignore_errors: true
- ansible.builtin.import_tasks: cleanup_startup_script.yml
ignore_errors: true
- ansible.builtin.import_tasks: cleanup_reserved_ip.yml
ignore_errors: true
- ansible.builtin.import_tasks: cleanup_network.yml
ignore_errors: true
7 changes: 4 additions & 3 deletions tests/integration/targets/instance/tasks/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@
loop_control:
loop_var: instance

- ansible.builtin.include_tasks: reinstall.yml
vars:
instance: "{{ vultr_instances | first }}"
### FIXME: return error, state=locked
# - ansible.builtin.include_tasks: reinstall.yml
# vars:
# instance: "{{ vultr_instances | first }}"

- ansible.builtin.include_tasks: absent.yml
with_items: "{{ vultr_instances }}"
Expand Down
4 changes: 4 additions & 0 deletions tests/integration/targets/snapshot/tasks/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
plan: "{{ vultr_instance.plan }}"
region: "{{ vultr_instance.region }}"
os: "{{ vultr_instance.os }}"
register: result
until: 'result.vultr_instance.server_status != "installingbooting"'
retries: 20
delay: 6

- ansible.builtin.include_tasks: present.yml
with_items: "{{ vultr_snapshots }}"
Expand Down
14 changes: 7 additions & 7 deletions tests/integration/targets/user/tasks/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
vultr.cloud.user:
name: "{{ vultr_user_name }}"
email: john.doe{{ vultr_resource_prefix }}@example.com
password: s3cr3t
password: "z,!B.DpCe.P6/8(pO||z"
acls:
- bad
- dns
Expand All @@ -53,7 +53,7 @@
vultr.cloud.user:
name: "{{ vultr_user_name }}"
email: john.doe{{ vultr_resource_prefix }}@example.com
password: s3cr3t
password: "z,!B.DpCe.P6/8(pO||z"
acls:
- upgrade
- dns
Expand All @@ -69,7 +69,7 @@
vultr.cloud.user:
name: "{{ vultr_user_name }}"
email: john.doe{{ vultr_resource_prefix }}@example.com
password: s3cr3t
password: "z,!B.DpCe.P6/8(pO||z"
acls:
- upgrade
- dns
Expand All @@ -90,7 +90,7 @@
vultr.cloud.user:
name: "{{ vultr_user_name }}"
email: john.doe{{ vultr_resource_prefix }}@example.com
password: s3cr3t
password: "z,!B.DpCe.P6/8(pO||z"
acls:
- upgrade
- dns
Expand All @@ -111,7 +111,7 @@
vultr.cloud.user:
name: "{{ vultr_user_name }}"
email: jimmy{{ vultr_resource_prefix }}@example.com
password: s3cr3t
password: "z,!B.DpCe.P6/8(pO||z"
api_enabled: false
acls:
- manage_users
Expand All @@ -134,7 +134,7 @@
vultr.cloud.user:
name: "{{ vultr_user_name }}"
email: jimmy{{ vultr_resource_prefix }}@example.com
password: s3cr3t
password: "z,!B.DpCe.P6/8(pO||z"
api_enabled: false
acls:
- manage_users
Expand All @@ -156,7 +156,7 @@
vultr.cloud.user:
name: "{{ vultr_user_name }}"
email: jimmy{{ vultr_resource_prefix }}@example.com
password: s3cr3t
password: "z,!B.DpCe.P6/8(pO||z"
api_enabled: false
acls:
- manage_users
Expand Down
Loading