From 5e8b62ecde17da9a51a83f6164fd40d7e1f683c8 Mon Sep 17 00:00:00 2001 From: Punith Kenchappa Date: Thu, 2 May 2024 14:06:50 +0530 Subject: [PATCH] OCTOPUS-718: Refactored code to small variable names Signed-off-by: Punith Kenchappa --- ...book.yml => intel-worker-add-playbook.yml} | 18 ++++++------ .../intel-worker-cleanup-playbook.yml | 4 +-- .../roles/approve_and_issue/defaults/main.yml | 5 ---- .../roles/csr_approve/defaults/main.yml | 5 ++++ .../files/csr_approve.sh} | 0 .../tasks/main.yml | 6 ++-- .../virtual_machine_action/tasks/main.yml | 8 ------ .../virtual_machine_create/defaults/main.yml | 28 ------------------- .../virtual_machine_create/tasks/main.yml | 24 ---------------- .../templates/resolv.conf.j2 | 2 -- .../virtual_machine_delete/defaults/main.yml | 4 --- .../defaults/main.yml | 8 +++--- .../playbooks/roles/vm_action/tasks/main.yml | 8 ++++++ .../roles/vm_create/defaults/main.yml | 28 +++++++++++++++++++ .../tasks/get_vm.yml | 2 +- .../tasks/ignition.yml | 8 +++--- .../playbooks/roles/vm_create/tasks/main.yml | 24 ++++++++++++++++ .../roles/vm_create/templates/resolv.conf.j2 | 2 ++ .../templates/worker-amd64.ign.j2 | 8 +++--- .../roles/vm_delete/defaults/main.yml | 4 +++ .../tasks/main.yml | 2 +- openstack/intel-worker/vars/main.yml | 4 +-- 22 files changed, 101 insertions(+), 101 deletions(-) rename openstack/intel-worker/playbooks/{intel-worker-playbook.yml => intel-worker-add-playbook.yml} (65%) delete mode 100644 openstack/intel-worker/playbooks/roles/approve_and_issue/defaults/main.yml create mode 100644 openstack/intel-worker/playbooks/roles/csr_approve/defaults/main.yml rename openstack/intel-worker/playbooks/roles/{approve_and_issue/files/approve_and_issue.sh => csr_approve/files/csr_approve.sh} (100%) rename openstack/intel-worker/playbooks/roles/{approve_and_issue => csr_approve}/tasks/main.yml (54%) delete mode 100644 openstack/intel-worker/playbooks/roles/virtual_machine_action/tasks/main.yml delete mode 100644 openstack/intel-worker/playbooks/roles/virtual_machine_create/defaults/main.yml delete mode 100644 openstack/intel-worker/playbooks/roles/virtual_machine_create/tasks/main.yml delete mode 100644 openstack/intel-worker/playbooks/roles/virtual_machine_create/templates/resolv.conf.j2 delete mode 100644 openstack/intel-worker/playbooks/roles/virtual_machine_delete/defaults/main.yml rename openstack/intel-worker/playbooks/roles/{virtual_machine_action => vm_action}/defaults/main.yml (59%) create mode 100644 openstack/intel-worker/playbooks/roles/vm_action/tasks/main.yml create mode 100644 openstack/intel-worker/playbooks/roles/vm_create/defaults/main.yml rename openstack/intel-worker/playbooks/roles/{virtual_machine_create => vm_create}/tasks/get_vm.yml (91%) rename openstack/intel-worker/playbooks/roles/{virtual_machine_create => vm_create}/tasks/ignition.yml (68%) create mode 100644 openstack/intel-worker/playbooks/roles/vm_create/tasks/main.yml create mode 100644 openstack/intel-worker/playbooks/roles/vm_create/templates/resolv.conf.j2 rename openstack/intel-worker/playbooks/roles/{virtual_machine_create => vm_create}/templates/worker-amd64.ign.j2 (60%) create mode 100644 openstack/intel-worker/playbooks/roles/vm_delete/defaults/main.yml rename openstack/intel-worker/playbooks/roles/{virtual_machine_delete => vm_delete}/tasks/main.yml (74%) diff --git a/openstack/intel-worker/playbooks/intel-worker-playbook.yml b/openstack/intel-worker/playbooks/intel-worker-add-playbook.yml similarity index 65% rename from openstack/intel-worker/playbooks/intel-worker-playbook.yml rename to openstack/intel-worker/playbooks/intel-worker-add-playbook.yml index a548a46..1730f51 100644 --- a/openstack/intel-worker/playbooks/intel-worker-playbook.yml +++ b/openstack/intel-worker/playbooks/intel-worker-add-playbook.yml @@ -16,31 +16,31 @@ tasks: - name: Virtual machine create role in loop ansible.builtin.include_role: - name: virtual_machine_create + name: vm_create loop: "{{ range(0, iterations) | list }}" loop_control: loop_var: iteration vars: - virtual_machine_create_name: "rdr-mac-worker-openstack-{{ iteration }}" - virtual_machine_create_worker_hostname: "rdr-mac-worker-openstack-{{ iteration }}" + vm_create_name: "rdr-mac-worker-openstack-{{ iteration }}" + vm_create_worker_hostname: "rdr-mac-worker-openstack-{{ iteration }}" - name: Approve and issue hosts: localhost roles: - - approve_and_issue + - csr_approve vars: - approve_and_issue_intel_count: 3 + csr_approve_intel_count: 3 - name: Intel worker vitrual_machine create hosts: localhost roles: - - virtual_machine_action + - vm_action vars: - virtual_machine_action_name: stop + vm_action_name: stop - name: Intel worker vitrual_machine create hosts: localhost roles: - - virtual_machine_action + - vm_action vars: - virtual_machine_action_name: start + vm_action_name: start diff --git a/openstack/intel-worker/playbooks/intel-worker-cleanup-playbook.yml b/openstack/intel-worker/playbooks/intel-worker-cleanup-playbook.yml index 66e3739..f9d940d 100644 --- a/openstack/intel-worker/playbooks/intel-worker-cleanup-playbook.yml +++ b/openstack/intel-worker/playbooks/intel-worker-cleanup-playbook.yml @@ -13,12 +13,12 @@ tasks: - name: Virtual machine delete role in loop ansible.builtin.include_role: - name: virtual_machine_delete + name: vm_delete loop: "{{ range(0, iterations) | list }}" loop_control: loop_var: iteration vars: - virtual_machine_delete_name: "rdr-mac-worker-openstack-{{ iteration }}" + vm_delete_name: "rdr-mac-worker-openstack-{{ iteration }}" - name: Intel worker flavor create hosts: localhost diff --git a/openstack/intel-worker/playbooks/roles/approve_and_issue/defaults/main.yml b/openstack/intel-worker/playbooks/roles/approve_and_issue/defaults/main.yml deleted file mode 100644 index 3f463fe..0000000 --- a/openstack/intel-worker/playbooks/roles/approve_and_issue/defaults/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -# Approve and issue vars -approve_and_issue_intel_count: 3 -approve_and_issue_intel_prefix: "rdr-mac" -approve_and_issue_intel_zone: "openstack" diff --git a/openstack/intel-worker/playbooks/roles/csr_approve/defaults/main.yml b/openstack/intel-worker/playbooks/roles/csr_approve/defaults/main.yml new file mode 100644 index 0000000..65ff86b --- /dev/null +++ b/openstack/intel-worker/playbooks/roles/csr_approve/defaults/main.yml @@ -0,0 +1,5 @@ +--- +# Approve and issue vars +csr_approve_intel_count: 3 +csr_approve_intel_prefix: "rdr-mac" +csr_approve_intel_zone: "openstack" diff --git a/openstack/intel-worker/playbooks/roles/approve_and_issue/files/approve_and_issue.sh b/openstack/intel-worker/playbooks/roles/csr_approve/files/csr_approve.sh similarity index 100% rename from openstack/intel-worker/playbooks/roles/approve_and_issue/files/approve_and_issue.sh rename to openstack/intel-worker/playbooks/roles/csr_approve/files/csr_approve.sh diff --git a/openstack/intel-worker/playbooks/roles/approve_and_issue/tasks/main.yml b/openstack/intel-worker/playbooks/roles/csr_approve/tasks/main.yml similarity index 54% rename from openstack/intel-worker/playbooks/roles/approve_and_issue/tasks/main.yml rename to openstack/intel-worker/playbooks/roles/csr_approve/tasks/main.yml index 65077b1..6ca9eb1 100644 --- a/openstack/intel-worker/playbooks/roles/approve_and_issue/tasks/main.yml +++ b/openstack/intel-worker/playbooks/roles/csr_approve/tasks/main.yml @@ -2,11 +2,11 @@ # file to add the approve and issue csr certificate - name: Copy the approve and issue file to tmp folder ansible.builtin.copy: - src: "{{ role_path }}/files/approve_and_issue.sh" - dest: /tmp/approve_and_issue.sh + src: "{{ role_path }}/files/csr_approve.sh" + dest: /tmp/csr_approve.sh mode: "0755" - name: Run the script to approve and issue csr certificate ansible.builtin.script: - cmd: /tmp/approve_and_issue.sh "{{ approve_and_issue_intel_count }}" "{{ approve_and_issue_intel_prefix }}" "{{ approve_and_issue_intel_zone }}" + cmd: /tmp/csr_approve.sh "{{ csr_approve_intel_count }}" "{{ csr_approve_intel_prefix }}" "{{ csr_approve_intel_zone }}" register: configdrive_partition_output diff --git a/openstack/intel-worker/playbooks/roles/virtual_machine_action/tasks/main.yml b/openstack/intel-worker/playbooks/roles/virtual_machine_action/tasks/main.yml deleted file mode 100644 index e230bf8..0000000 --- a/openstack/intel-worker/playbooks/roles/virtual_machine_action/tasks/main.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- name: Virtual machine action like start/stop/restart etc in the Multi-Arch Compute OpenStack - openstack.cloud.server_action: - cloud: openstack - action: "{{ virtual_machine_action_name }}" - server: "{{ virtual_machine_action_vmname }}" - timeout: "{{ virtual_machine_action_timeout }}" - wait: "{{ virtual_machine_action_wait }}" diff --git a/openstack/intel-worker/playbooks/roles/virtual_machine_create/defaults/main.yml b/openstack/intel-worker/playbooks/roles/virtual_machine_create/defaults/main.yml deleted file mode 100644 index 6bc635d..0000000 --- a/openstack/intel-worker/playbooks/roles/virtual_machine_create/defaults/main.yml +++ /dev/null @@ -1,28 +0,0 @@ ---- -# Virtual_machine details -virtual_machine_create_name: rdr-mac-worker-openstack -virtual_machine_create_region_name: RegionOne -virtual_machine_create_availability_zone: Test -virtual_machine_create_image_name: 4df699b6-6877-4b77-9ddb-0d6dc9cefb68 -virtual_machine_create_flavor: "m1.medium" -virtual_machine_create_volume_size: 80 -virtual_machine_create_keypair_name: pun_keypair -virtual_machine_create_network_name: provider -virtual_machine_create_userdata: "{{ lookup('template', 'worker-amd64.ign.j2') }}" -virtual_machine_create_timeout: 300 -virtual_machine_create_count: 3 - -# Used in ignition task -virtual_machine_create_worker_hostname: "rdr-mac-worker-openstack" -virtual_machine_create_worker_hostname_encoded: "" -virtual_machine_create_etc_resolve_encoded: "" -virtual_machine_create_dns_none_encoded: "" -virtual_machine_create_bastion_ip: "10.20.181.69" -virtual_machine_create_domain_name: "rdr-mac1" -virtual_machine_create_http_port: "8080" -virtual_machine_create_https_port: "443" - -# Ignition Files -virtual_machine_create_dns_none_conf: |- - [main] - dns=none diff --git a/openstack/intel-worker/playbooks/roles/virtual_machine_create/tasks/main.yml b/openstack/intel-worker/playbooks/roles/virtual_machine_create/tasks/main.yml deleted file mode 100644 index da48471..0000000 --- a/openstack/intel-worker/playbooks/roles/virtual_machine_create/tasks/main.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -# file: intel-worker-playbook.yml -- name: Create ignition file - ansible.builtin.include_tasks: - file: ignition.yml - -- name: Create server in the Multi-Arch Compute OpenStack Instance - openstack.cloud.server: - cloud: openstack - state: present - name: "{{ virtual_machine_create_name }}" - region_name: "{{ virtual_machine_create_region_name }}" - availability_zone: "{{ virtual_machine_create_availability_zone }}" - image: "{{ virtual_machine_create_image_name }}" - flavor: "{{ virtual_machine_create_flavor }}" - volume_size: "{{ virtual_machine_create_volume_size }}" - key_name: "{{ virtual_machine_create_keypair_name }}" - network: "{{ virtual_machine_create_network_name }}" - userdata: "{{ virtual_machine_create_userdata }}" - timeout: "{{ virtual_machine_create_timeout }}" - -- name: Get and wait for VM in active state - ansible.builtin.include_tasks: - file: get_vm.yml diff --git a/openstack/intel-worker/playbooks/roles/virtual_machine_create/templates/resolv.conf.j2 b/openstack/intel-worker/playbooks/roles/virtual_machine_create/templates/resolv.conf.j2 deleted file mode 100644 index 2980d19..0000000 --- a/openstack/intel-worker/playbooks/roles/virtual_machine_create/templates/resolv.conf.j2 +++ /dev/null @@ -1,2 +0,0 @@ -search {{ virtual_machine_create_domain_name }} -nameserver {{ virtual_machine_create_bastion_ip }} diff --git a/openstack/intel-worker/playbooks/roles/virtual_machine_delete/defaults/main.yml b/openstack/intel-worker/playbooks/roles/virtual_machine_delete/defaults/main.yml deleted file mode 100644 index 9eba30f..0000000 --- a/openstack/intel-worker/playbooks/roles/virtual_machine_delete/defaults/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -# Virtual_machine details -virtual_machine_delete_name: rdr-mac-worker-openstack -virtual_machine_delete_count: 3 diff --git a/openstack/intel-worker/playbooks/roles/virtual_machine_action/defaults/main.yml b/openstack/intel-worker/playbooks/roles/vm_action/defaults/main.yml similarity index 59% rename from openstack/intel-worker/playbooks/roles/virtual_machine_action/defaults/main.yml rename to openstack/intel-worker/playbooks/roles/vm_action/defaults/main.yml index be8fabd..e935fab 100644 --- a/openstack/intel-worker/playbooks/roles/virtual_machine_action/defaults/main.yml +++ b/openstack/intel-worker/playbooks/roles/vm_action/defaults/main.yml @@ -1,7 +1,7 @@ --- # Virtual machine action -virtual_machine_action_name: stop -virtual_machine_action_vmname: rdr-mac-worker +vm_action_name: stop +vm_action_vmname: rdr-mac-worker # server action list # "lock" # "pause" @@ -17,5 +17,5 @@ virtual_machine_action_vmname: rdr-mac-worker # "unlock" # "unpause" # "unshelve" -virtual_machine_action_timeout: 200 -virtual_machine_action_wait: true +vm_action_timeout: 200 +vm_action_wait: true diff --git a/openstack/intel-worker/playbooks/roles/vm_action/tasks/main.yml b/openstack/intel-worker/playbooks/roles/vm_action/tasks/main.yml new file mode 100644 index 0000000..c1e79b9 --- /dev/null +++ b/openstack/intel-worker/playbooks/roles/vm_action/tasks/main.yml @@ -0,0 +1,8 @@ +--- +- name: Virtual machine action like start/stop/restart etc in the Multi-Arch Compute OpenStack + openstack.cloud.server_action: + cloud: openstack + action: "{{ vm_action_name }}" + server: "{{ vm_action_vmname }}" + timeout: "{{ vm_action_timeout }}" + wait: "{{ vm_action_wait }}" diff --git a/openstack/intel-worker/playbooks/roles/vm_create/defaults/main.yml b/openstack/intel-worker/playbooks/roles/vm_create/defaults/main.yml new file mode 100644 index 0000000..d5d0c0b --- /dev/null +++ b/openstack/intel-worker/playbooks/roles/vm_create/defaults/main.yml @@ -0,0 +1,28 @@ +--- +# Virtual_machine details +vm_create_name: rdr-mac-worker-openstack +vm_create_region_name: RegionOne +vm_create_availability_zone: Test +vm_create_image_name: 4df699b6-6877-4b77-9ddb-0d6dc9cefb68 +vm_create_flavor: "m1.medium" +vm_create_volume_size: 80 +vm_create_keypair_name: pun_keypair +vm_create_network_name: provider +vm_create_userdata: "{{ lookup('template', 'worker-amd64.ign.j2') }}" +vm_create_timeout: 300 +vm_create_count: 3 + +# Used in ignition task +vm_create_worker_hostname: "rdr-mac-worker-openstack" +vm_create_worker_hostname_encoded: "" +vm_create_etc_resolve_encoded: "" +vm_create_dns_none_encoded: "" +vm_create_bastion_ip: "10.20.181.69" +vm_create_domain_name: "rdr-mac1" +vm_create_http_port: "8080" +vm_create_https_port: "443" + +# Ignition Files +vm_create_dns_none_conf: |- + [main] + dns=none diff --git a/openstack/intel-worker/playbooks/roles/virtual_machine_create/tasks/get_vm.yml b/openstack/intel-worker/playbooks/roles/vm_create/tasks/get_vm.yml similarity index 91% rename from openstack/intel-worker/playbooks/roles/virtual_machine_create/tasks/get_vm.yml rename to openstack/intel-worker/playbooks/roles/vm_create/tasks/get_vm.yml index 700eda3..0172fe9 100644 --- a/openstack/intel-worker/playbooks/roles/virtual_machine_create/tasks/get_vm.yml +++ b/openstack/intel-worker/playbooks/roles/vm_create/tasks/get_vm.yml @@ -2,7 +2,7 @@ - name: Get virtual machine info openstack.cloud.server_info: cloud: openstack - name: "{{ virtual_machine_create_name }}" + name: "{{ vm_create_name }}" register: vm_info - name: Print virtual machine vm_info diff --git a/openstack/intel-worker/playbooks/roles/virtual_machine_create/tasks/ignition.yml b/openstack/intel-worker/playbooks/roles/vm_create/tasks/ignition.yml similarity index 68% rename from openstack/intel-worker/playbooks/roles/virtual_machine_create/tasks/ignition.yml rename to openstack/intel-worker/playbooks/roles/vm_create/tasks/ignition.yml index 3055233..00f273b 100644 --- a/openstack/intel-worker/playbooks/roles/virtual_machine_create/tasks/ignition.yml +++ b/openstack/intel-worker/playbooks/roles/vm_create/tasks/ignition.yml @@ -1,7 +1,7 @@ --- - name: Create worker.ign and store it to /var/www/html/ignition/ ansible.builtin.get_url: - url: https://{{ virtual_machine_create_bastion_ip }}:22623/config/worker + url: https://{{ vm_create_bastion_ip }}:22623/config/worker validate_certs: false dest: /var/www/html/ignition/worker-amd64.ign mode: "0644" @@ -17,9 +17,9 @@ - name: Set the variables (To be used in Customization Script) ansible.builtin.set_fact: - worker_hostname_encoded: "{{ virtual_machine_create_worker_hostname | b64encode }}" - dns_none_encoded: "{{ virtual_machine_create_dns_none_conf | b64encode }}" - etc_resolve_encoded: "{{ lookup('template', 'resolv.conf.j2') | b64encode }}" + vm_create_worker_hostname_encoded: "{{ vm_create_worker_hostname | b64encode }}" + vm_create_dns_none_encoded: "{{ vm_create_dns_none_conf | b64encode }}" + vm_create_etc_resolve_encoded: "{{ lookup('template', 'resolv.conf.j2') | b64encode }}" - name: Create the Intel ignition file ansible.builtin.template: diff --git a/openstack/intel-worker/playbooks/roles/vm_create/tasks/main.yml b/openstack/intel-worker/playbooks/roles/vm_create/tasks/main.yml new file mode 100644 index 0000000..4648bf4 --- /dev/null +++ b/openstack/intel-worker/playbooks/roles/vm_create/tasks/main.yml @@ -0,0 +1,24 @@ +--- +# file: intel-worker-playbook.yml +- name: Create ignition file + ansible.builtin.include_tasks: + file: ignition.yml + +- name: Create server in the Multi-Arch Compute OpenStack Instance + openstack.cloud.server: + cloud: openstack + state: present + name: "{{ vm_create_name }}" + region_name: "{{ vm_create_region_name }}" + availability_zone: "{{ vm_create_availability_zone }}" + image: "{{ vm_create_image_name }}" + flavor: "{{ vm_create_flavor }}" + volume_size: "{{ vm_create_volume_size }}" + key_name: "{{ vm_create_keypair_name }}" + network: "{{ vm_create_network_name }}" + userdata: "{{ vm_create_userdata }}" + timeout: "{{ vm_create_timeout }}" + +- name: Get and wait for VM in active state + ansible.builtin.include_tasks: + file: get_vm.yml diff --git a/openstack/intel-worker/playbooks/roles/vm_create/templates/resolv.conf.j2 b/openstack/intel-worker/playbooks/roles/vm_create/templates/resolv.conf.j2 new file mode 100644 index 0000000..5281090 --- /dev/null +++ b/openstack/intel-worker/playbooks/roles/vm_create/templates/resolv.conf.j2 @@ -0,0 +1,2 @@ +search {{ vm_create_domain_name }} +nameserver {{ vm_create_bastion_ip }} diff --git a/openstack/intel-worker/playbooks/roles/virtual_machine_create/templates/worker-amd64.ign.j2 b/openstack/intel-worker/playbooks/roles/vm_create/templates/worker-amd64.ign.j2 similarity index 60% rename from openstack/intel-worker/playbooks/roles/virtual_machine_create/templates/worker-amd64.ign.j2 rename to openstack/intel-worker/playbooks/roles/vm_create/templates/worker-amd64.ign.j2 index 3a9ffd7..299a15c 100644 --- a/openstack/intel-worker/playbooks/roles/virtual_machine_create/templates/worker-amd64.ign.j2 +++ b/openstack/intel-worker/playbooks/roles/vm_create/templates/worker-amd64.ign.j2 @@ -4,7 +4,7 @@ "config": { "merge": [ { - "source": "http://{{ virtual_machine_create_bastion_ip }}:{{ virtual_machine_create_http_port }}/ignition/worker-amd64.ign" + "source": "http://{{ vm_create_bastion_ip }}:{{ vm_create_http_port }}/ignition/worker-amd64.ign" } ] } @@ -19,7 +19,7 @@ "path": "/etc/hostname", "user": {}, "contents": { - "source": "data:text/plain;base64,{{ virtual_machine_create_worker_hostname_encoded }}", + "source": "data:text/plain;base64,{{ vm_create_worker_hostname_encoded }}", "verification": {} }, "mode": 420 @@ -29,7 +29,7 @@ "path": "/etc/resolv.conf", "user": {}, "contents": { - "source": "data:text/plain;base64,{{ virtual_machine_create_etc_resolve_encoded }}", + "source": "data:text/plain;base64,{{ vm_create_etc_resolve_encoded }}", "verification": {} }, "mode": 420 @@ -39,7 +39,7 @@ "path": "/etc/NetworkManager/conf.d/90-dns-none.conf", "user": {}, "contents": { - "source": "data:text/plain;base64,{{ virtual_machine_create_dns_none_encoded }}", + "source": "data:text/plain;base64,{{ vm_create_dns_none_encoded }}", "verification": {} }, "mode": 420 diff --git a/openstack/intel-worker/playbooks/roles/vm_delete/defaults/main.yml b/openstack/intel-worker/playbooks/roles/vm_delete/defaults/main.yml new file mode 100644 index 0000000..c526d8c --- /dev/null +++ b/openstack/intel-worker/playbooks/roles/vm_delete/defaults/main.yml @@ -0,0 +1,4 @@ +--- +# Virtual_machine details +vm_delete_name: rdr-mac-worker-openstack +vm_delete_count: 3 diff --git a/openstack/intel-worker/playbooks/roles/virtual_machine_delete/tasks/main.yml b/openstack/intel-worker/playbooks/roles/vm_delete/tasks/main.yml similarity index 74% rename from openstack/intel-worker/playbooks/roles/virtual_machine_delete/tasks/main.yml rename to openstack/intel-worker/playbooks/roles/vm_delete/tasks/main.yml index 6260af4..1374d9b 100644 --- a/openstack/intel-worker/playbooks/roles/virtual_machine_delete/tasks/main.yml +++ b/openstack/intel-worker/playbooks/roles/vm_delete/tasks/main.yml @@ -3,4 +3,4 @@ openstack.cloud.server: cloud: openstack state: absent - name: "{{ virtual_machine_delete_name }}" + name: "{{ vm_delete_name }}" diff --git a/openstack/intel-worker/vars/main.yml b/openstack/intel-worker/vars/main.yml index 5e12065..d3fb3a2 100644 --- a/openstack/intel-worker/vars/main.yml +++ b/openstack/intel-worker/vars/main.yml @@ -91,8 +91,8 @@ virtual_machine_server_action: start # "unlock" # "unpause" # "unshelve" -virtual_machine_action_timeout: 200 -virtual_machine_action_wait: true +vm_action_timeout: 200 +vm_action_wait: true # Host aggregate details host_aggregate_name: multi-arch-compute-aggregate