7 files changed, 105 insertions, 41 deletions

diff --git a/ansible/infra_deploy.yml b/ansible/infra_deploy.yml
index 10f53fbad..948dd338a 100644
--- a/ansible/infra_deploy.yml
+++ b/ansible/infra_deploy.yml
@@ -16,3 +16,4 @@
 
   roles:
     - infra_check_requirements
+    - infra_destroy_previous_configuration
diff --git a/ansible/load_images.yml b/ansible/load_images.yml
index a4c130d46..d4b24c864 100644
--- a/ansible/load_images.yml
+++ b/ansible/load_images.yml
@@ -29,41 +29,15 @@
         IMAGE_COMMAND: yardstick-img-modify
         IMAGE_OUTPUT: "/tmp/workspace/yardstick/yardstick-image.tar.gz"
 
-#    QCOW_IMAGE: "/tmp/workspace/yardstick/yardstick-image.img"
-#    RAW_IMAGE: "/tmp/workspace/yardstick/yardstick-image.tar.gz"
-#    IMAGE_COMMANDS:
-#      'lxd': yardstick-img-lxd-modify
-#      'default': yardstick-img-modify
-
-
   roles:
     - role: add_fuel_jumphost
       when: "INSTALLER_TYPE == 'fuel'"
     - role: detect_fuel_arch
       when: "INSTALLER_TYPE == 'fuel'"
 
-#  post_tasks:
-#
-#    - command: "{{ DEPLOY_VARS[DEPLOY_SCENARIO].IMAGE_COMMAND }}" "{{ IMAGE_MODIFY_SCRIPT }}"
-#      become: true
-#      register: image_modify_result
-#      retries: 2
-#      untils: image_modify_result|succeeded
-#
-#    - stat: path="{{ DEPLOY_VARS[DEPLOY_SCENARIO].IMAGE_OUTPUT }}"}
-#      register: output_stat
-#
-#    - fail: msg=""
-#      when: not output_stat
-
-
 - include: build_yardstick_image.yml
+  vars:
+    img_property: normal
 
 - include: image_uploaders/upload_yardstick_image.yml
 
-# upload cirros
-# upload vanilla ubuntu cloud_image
-
-# - include: create_flavors.yml
-
-
diff --git a/ansible/prepare_openstack.yml b/ansible/prepare_openstack.yml
index 8456c9e59..6f54ef522 100644
--- a/ansible/prepare_openstack.yml
+++ b/ansible/prepare_openstack.yml
@@ -12,27 +12,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ---
-- name: convert openrc_file to openrc env dict
+- name: Convert openrc_file to openrc env dict
   hosts: jumphost
   vars_files:
     - yardstick_config.yml
   roles:
     - convert_openrc
 
-###
-#  Build yardstick image for openstack quest
-#  check included file for other vars/env
-###
-- include: build_yardstick_image.yml
+- name: Build Yardstick image for OpenStack
+  include: build_yardstick_image.yml
   vars:
     YARD_IMG_ARCH: amd64
     release: xenial
+    img_property: nsb
 
-###
-#  Delete old yardstick image and flavors
-#  Upload new image
-###
-- name: cleanup old openstack images, upload new
+- name: Cleanup old OpenStack images and upload the new one
   hosts: jumphost
   vars_files:
     - yardstick_config.yml
diff --git a/ansible/roles/create_samplevnfs_image/tasks/main.yml b/ansible/roles/create_samplevnfs_image/tasks/main.yml
index c83cccab5..ab7371a12 100644
--- a/ansible/roles/create_samplevnfs_image/tasks/main.yml
+++ b/ansible/roles/create_samplevnfs_image/tasks/main.yml
@@ -19,6 +19,6 @@
     is_public: yes
     disk_format: qcow2
     container_format: bare
-    filename: "{{ raw_imgfile }}"
+    filename: "{{ imgfile }}"
     properties:
       hw_vif_multiqueue_enabled: true
diff --git a/ansible/roles/download_drivers/defaults/main.yml b/ansible/roles/download_drivers/defaults/main.yml
index ff4c30785..ab68a3c6d 100644
--- a/ansible/roles/download_drivers/defaults/main.yml
+++ b/ansible/roles/download_drivers/defaults/main.yml
@@ -14,7 +14,7 @@
 ---
 i40evf_version: "3.4.2"
 i40evf_gzfile: "i40evf-{{ i40evf_version }}.tar.gz"
-i40evf_url: "https://sourceforge.net/projects/e1000/files/i40evf%20stable/{{ i40evf_version }}/{{ i40evf_gzfile }}/download"
+i40evf_url: "https://netix.dl.sourceforge.net/project/e1000/i40evf%20stable/{{ i40evf_version }}/{{ i40evf_gzfile }}"
 i40evf_dest: "{{ clone_dest }}/"
 i40evf_path: "{{ i40evf_dest }}/{{ i40evf_gzfile|regex_replace('[.]tar[.]gz$', '') }}"
 i40evf_checksum:
diff --git a/ansible/roles/infra_destroy_previous_configuration/tasks/delete_network.yml b/ansible/roles/infra_destroy_previous_configuration/tasks/delete_network.yml
new file mode 100644
index 000000000..314ee30af
--- /dev/null
+++ b/ansible/roles/infra_destroy_previous_configuration/tasks/delete_network.yml
@@ -0,0 +1,48 @@
+# Copyright (c) 2017-2018 Intel Corporation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+---
+- name: Destroy old networks created by virt
+  virt_net:
+    name: "{{ network_item.name }}"
+    command: destroy
+  when: network_item.name in virt_nets.list_nets
+
+# Ignoring erros 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 }}"
+    command: undefine
+  when: network_item.name in virt_nets.list_nets
+  ignore_errors: yes
+
+- name: Check if "ovs-vsctl" command is present
+  command: which ovs-vsctl
+  register: ovs_vsctl_present
+  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
+
+- name: Check if linux bridge is present
+  stat: path="{{ '/sys/class/net/'+network_item.name+'/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
diff --git a/ansible/roles/infra_destroy_previous_configuration/tasks/main.yml b/ansible/roles/infra_destroy_previous_configuration/tasks/main.yml
new file mode 100644
index 000000000..5595cd501
--- /dev/null
+++ b/ansible/roles/infra_destroy_previous_configuration/tasks/main.yml
@@ -0,0 +1,47 @@
+# Copyright (c) 2017-2018 Intel Corporation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+---
+- name: Include
+  include_vars:
+    file: "{{ rs_file }}"
+    name: infra_deploy_vars
+
+- name: List virt-nets
+  virt_net: command=list_nets
+  register: virt_nets
+
+- name: List VMs
+  virt: command=list_vms
+  register: virt_vms
+
+- name: Destroy old VMs
+  virt:
+    command: destroy
+    name: "{{ item.hostname }}"
+  when: item.hostname in virt_vms.list_vms
+  with_items: "{{ infra_deploy_vars.nodes }}"
+
+- name: Undefine old VMs
+  virt:
+    command: undefine
+    name: "{{ item.hostname }}"
+  when: item.hostname in virt_vms.list_vms
+  with_items: "{{ infra_deploy_vars.nodes }}"
+
+- 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 }}"