OpenStack deployment: delete RS or all VMs

New parameter is added to shell script to delete data for VMs either from
input file or all.
Added disk images removal as per new input parameter.

JIRA: YARDSTICK-1123

Change-Id: I8d2cee4a3a7ad7147f4d59303bab656d80370221
Signed-off-by: Stepan Andrushko <stepanx.andrushko@intel.com>

diff --git a/ansible/infra_deploy.yml b/ansible/infra_deploy.yml
index 4ad21af..0298795 100644 (file)
--- a/ansible/infra_deploy.yml
+++ b/ansible/infra_deploy.yml
@@ -13,9 +13,12 @@
 # limitations under the License.
 ---
 - hosts: jumphost
+  vars:
+    rs_file: "{{ RS_FILE }}"
+    clean_up: "{{ CLEAN_UP | default(False) }}" # If True will be delete all VMs, networks, disk images
 
   roles:
-    - infra_check_requirements
     - infra_destroy_previous_configuration
+    - infra_check_requirements
     - infra_create_network
     - infra_create_vms

diff --git a/ansible/roles/infra_destroy_previous_configuration/tasks/delete_network.yml b/ansible/roles/infra_destroy_previous_configuration/tasks/delete_network.yml
index 314ee30..5e61633 100644 (file)
--- a/ansible/roles/infra_destroy_previous_configuration/tasks/delete_network.yml
+++ b/ansible/roles/infra_destroy_previous_configuration/tasks/delete_network.yml
@@ -14,18 +14,18 @@
 ---
 - name: Destroy old networks created by virt
   virt_net:
-    name: "{{ network_item.name }}"
+    name: "{{ network_item }}"
     command: destroy
-  when: network_item.name in virt_nets.list_nets
+  when: clean_up | bool or network_item in deploy_nets
 
-# Ignoring erros as network can be created without being defined.
+# Ignoring errors as network can be created without being defined.
 # This can happen if a user manually creates a network using the virsh command.
 # If the network is not defined the undefine code will throw an error.
 - name: Undefine old networks defined by virt
   virt_net:
-    name: "{{ network_item.name }}"
+    name: "{{ network_item }}"
     command: undefine
-  when: network_item.name in virt_nets.list_nets
+  when: clean_up | bool or network_item in deploy_nets
   ignore_errors: yes
 
 - name: Check if "ovs-vsctl" command is present
@@ -34,15 +34,20 @@
   ignore_errors: yes
 
 - name: Destroy OVS bridge if it exists
-  command: ovs-vsctl --if-exists -- del-br "{{ network_item.name }}"
-  when: ovs_vsctl_present.rc == 0
+  command: ovs-vsctl --if-exists -- del-br "{{ network_item }}"
+  when:
+    - ovs_vsctl_present.rc == 0
+    - clean_up | bool or network_item in deploy_nets
+  ignore_errors: yes
 
 - name: Check if linux bridge is present
-  stat: path="{{ '/sys/class/net/'+network_item.name+'/brif/' }}"
+  stat: path="{{ '/sys/class/net/' + network_item + '/brif/' }}"
   register: check_linux_bridge
 
 - name: Remove linux bridge if it exists
   shell: |
-    ifconfig "{{ network_item.name }}" down
-    brctl delbr "{{ network_item.name }}"
-  when: check_linux_bridge.stat.exists
+    ifconfig "{{ network_item }}" down
+    brctl delbr "{{ network_item }}"
+  when:
+    - check_linux_bridge.stat.exists
+    - clean_up | bool or network_item in deploy_nets

diff --git a/ansible/roles/infra_destroy_previous_configuration/tasks/delete_vm.yml b/ansible/roles/infra_destroy_previous_configuration/tasks/delete_vm.yml
index 5e43ee8..91e9493 100644 (file)
--- a/ansible/roles/infra_destroy_previous_configuration/tasks/delete_vm.yml
+++ b/ansible/roles/infra_destroy_previous_configuration/tasks/delete_vm.yml
@@ -16,14 +16,14 @@
 - name: Destroy old VMs
   virt:
     command: destroy
-    name: "{{ node_item.hostname }}"
-  when: node_item.hostname in virt_vms.list_vms
+    name: "{{ vmhost_item }}"
+  when: clean_up | bool or vmhost_item in deploy_vms
   ignore_errors: yes
 
 # Ignore errors as VM can be running while undefined
 - name: Undefine old VMs
   virt:
     command: undefine
-    name: "{{ node_item.hostname }}"
-  when: node_item.hostname in virt_vms.list_vms
+    name: "{{ vmhost_item }}"
+  when: clean_up | bool or vmhost_item in deploy_vms
   ignore_errors: yes

diff --git a/ansible/roles/infra_destroy_previous_configuration/tasks/main.yml b/ansible/roles/infra_destroy_previous_configuration/tasks/main.yml
index e6c2c02..6c4aa33 100644 (file)
--- a/ansible/roles/infra_destroy_previous_configuration/tasks/main.yml
+++ b/ansible/roles/infra_destroy_previous_configuration/tasks/main.yml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ---
-- name: Include
+- name: Include input file
   include_vars:
     file: "{{ rs_file }}"
     name: infra_deploy_vars
@@ -25,16 +25,40 @@
   virt: command=list_vms
   register: virt_vms
 
+- set_fact:
+    deploy_vms: "{{ deploy_vms | default([]) + [item.hostname] }}"
+  with_items: "{{ infra_deploy_vars.nodes }}"
+
+- name: Define old disk images to delete
+  shell: virsh domblklist {{ item }} | awk '/\/.*/ { print $2 }'
+  when: clean_up | bool or item in deploy_vms
+  with_items: "{{ virt_vms.list_vms }}"
+  register: virt_img
+
+- set_fact:
+    images: "{{ images | default([]) + item.stdout_lines }}"
+  when: item.stdout_lines is defined and item.stdout_lines | length > 0
+  with_items: "{{ virt_img.results }}"
+
 - name: Destroy old VMs
   include_tasks: delete_vm.yml
-  extra_vars: "{{ virt_vms }}"
   loop_control:
-    loop_var: node_item
-  with_items: "{{ infra_deploy_vars.nodes }}"
+    loop_var: vmhost_item
+  with_items: "{{ virt_vms.list_vms }}"
+
+- set_fact:
+    deploy_nets: "{{ deploy_nets | default([]) + [item.name] }}"
+  with_items: "{{ infra_deploy_vars.networks }}"
 
 - name: Delete old networks
   include_tasks: delete_network.yml
-  extra_vars: "{{ virt_nets }}"
   loop_control:
     loop_var: network_item
-  with_items: "{{ infra_deploy_vars.networks }}"
+  with_items: "{{ virt_nets.list_nets }}"
+
+- name: Delete old disk images
+  file:
+    path: "{{ item }}"
+    state: absent
+  when: images is defined and images | length > 0
+  with_items: "{{ images }}"

diff --git a/tools/virt_ci_rampup.sh b/tools/virt_ci_rampup.sh
index 6a9f2e7..d9aa23c 100755 (executable)
--- a/tools/virt_ci_rampup.sh
+++ b/tools/virt_ci_rampup.sh
@@ -15,7 +15,7 @@
 
 ANSIBLE_SCRIPTS="${0%/*}/../ansible"
 
-cd ${ANSIBLE_SCRIPTS} &&\
+cd ${ANSIBLE_SCRIPTS} && \
 sudo -EH ansible-playbook \
-         -e rs_file='../etc/infra/infra_deploy.yaml' \
+         -e RS_FILE='../etc/infra/infra_deploy.yaml' -e CLEAN_UP=False \
          -i inventory.ini infra_deploy.yml