7 files changed, 109 insertions, 24 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/nsb_setup.yml b/ansible/nsb_setup.yml
index bfe5d2349..98a59f984 100644
--- a/ansible/nsb_setup.yml
+++ b/ansible/nsb_setup.yml
@@ -12,18 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ---
-#- name: Prepare baremetal machine
-#  include: ubuntu_server_baremetal_deploy_samplevnfs.yml
-#  vars:
-#    YARD_IMG_ARCH: amd64
-#
-#- name: Install jumphost dependencies and configure docker
-#  hosts: jumphost
-#  environment:
-#    "{{ proxy_env }}"
-#  roles:
-#    - install_dependencies
-#    - docker
+- name: Prepare baremetal machine
+  include: ubuntu_server_baremetal_deploy_samplevnfs.yml
+  vars:
+    YARD_IMG_ARCH: amd64
+
+- name: Install jumphost dependencies and configure docker
+  hosts: jumphost
+  environment:
+    "{{ proxy_env }}"
+  roles:
+    - install_dependencies
+    - docker
 
 - name: "handle all openstack stuff when: openrc_file is defined"
   include: prepare_openstack.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/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 }}"
diff --git a/ansible/roles/install_dpdk/tasks/main.yml b/ansible/roles/install_dpdk/tasks/main.yml
index 01ad4baf1..e82ad8363 100644
--- a/ansible/roles/install_dpdk/tasks/main.yml
+++ b/ansible/roles/install_dpdk/tasks/main.yml
@@ -121,11 +121,3 @@
     remote_src: yes
     force: yes
     mode: 0755
-
-- name: make dpdk_nic_bind.py for backwards compatibility
-  copy:
-    src: "{{ dpdk_devbind[dpdk_version] }}"
-    dest: "{{ INSTALL_BIN_PATH }}/dpdk_nic_bind.py"
-    remote_src: yes
-    force: yes
-    mode: 0755
diff --git a/ansible/roles/install_trex/tasks/main.yml b/ansible/roles/install_trex/tasks/main.yml
index 7ba1fc833..9113c887f 100644
--- a/ansible/roles/install_trex/tasks/main.yml
+++ b/ansible/roles/install_trex/tasks/main.yml
@@ -31,9 +31,6 @@
     dest: "{{ INSTALL_BIN_PATH }}/trex_client"
     state: link
 
-# Don't use trex/scripts/dpdk_nic_bind.py use DPDK usertools/dpdk-devbind.py
-#- command: cp "{{ INSTALL_BIN_PATH }}/trex/scripts/dpdk_nic_bind.py" "{{ INSTALL_BIN_PATH }}"
-
 - name: add scripts to PYTHONPATH
   lineinfile:
     dest: /etc/environment