X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ansible%2Finstall.yaml;h=558c48609fbb87b83d647bc91e1ab1c3c0e55be9;hb=0a3b5559a0da61bd5190eca098f8028ae97afe0e;hp=d181c5ffd86c293896269fe340de2b4cae52cc78;hpb=e2f2e6b380fb63c4dcabe611aee180d4a0baa034;p=yardstick.git

diff --git a/ansible/install.yaml b/ansible/install.yaml
index d181c5ffd..558c48609 100644
--- a/ansible/install.yaml
+++ b/ansible/install.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Intel Corporation.
+# Copyright (c) 2018-2019 Intel Corporation.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -39,7 +39,8 @@
     - { role: configure_gui, when: installation_mode != inst_mode_container_pull }
     - { role: download_trex, when: installation_mode != inst_mode_container_pull }
     - { role: install_trex, when: installation_mode != inst_mode_container_pull }
-    - { role: configure_rabbitmq, when: installation_mode == inst_mode_baremetal }
+    - role: configure_rabbitmq
+      install_mode: "{{ installation_mode }}"
 
 
   post_tasks:
@@ -67,6 +68,7 @@
     # can't update grub in chroot/docker
     - enable_hugepages_on_boot
     - enable_iommu_on_boot
+    - enable_cpu_isolation_on_boot
     # needed for collectd plugins
     - increase_open_file_limits
     - install_image_dependencies
@@ -116,7 +118,9 @@
       include_role:
         name: build_yardstick_image
         tasks_from: pre_build.yml
-      when: installation_mode != inst_mode_container
+      when:
+        - installation_mode != inst_mode_container
+        - IMG_PROPERTY == 'nsb' or IMG_PROPERTY == 'normal'
 
 
 - name: Build VM in chroot
@@ -132,7 +136,9 @@
       include_role:
         name: build_yardstick_image
         tasks_from: "cloudimg_modify_{{ img_property }}.yml"
-      when: installation_mode != inst_mode_container
+      when:
+        - installation_mode != inst_mode_container
+        - IMG_PROPERTY == 'nsb' or IMG_PROPERTY == 'normal'
 
 
 - name: Clear up after VM is built
@@ -144,28 +150,48 @@
       include_role:
         name: build_yardstick_image
         tasks_from: post_build.yml
-      when: installation_mode != inst_mode_container
+      when:
+        - installation_mode != inst_mode_container
+        - IMG_PROPERTY == 'nsb' or IMG_PROPERTY == 'normal'
 
 
-- hosts: jumphost
+- name: Add OpenStack variables, image
+  hosts: jumphost
+  vars:
+    openrc_flag: false
   vars_files:
     - yardstick_config.yml
 
-  roles:
-    - { role: convert_openrc, when: openrc_file is defined }
+  pre_tasks:
+    - name: Get information about external VM image
+      stat:
+        path: "{{ path_to_img }}"
+      register: image_file_stat
+      when:
+        - path_to_img is defined
+        - imgfile is not defined
 
+    - set_fact:
+        imgfile: "{{ path_to_img }}"
+      when:
+        - path_to_img is defined
+        - imgfile is not defined
+        - image_file_stat.stat.islnk is defined
+        - not image_file_stat.stat.islnk
 
-- name: Add OpenStack variables, image
-  hosts: jumphost
-  vars_files:
-    - yardstick_config.yml
-  environment:
-    "{{ openrc }}"
+    - set_fact:
+        openrc_flag: true
+      when:
+        - openrc_file is defined
+        - imgfile is defined
 
   roles:
-    - { role: clean_images, when: openrc_file is defined }
-    - { role: clean_flavors, when: openrc_file is defined }
-    - { role: create_samplevnfs_image, when: openrc_file is defined }
+    - { role: convert_openrc, when: openrc_file is defined }
+    - { role: clean_images, when: openrc_flag }
+    - { role: clean_flavors, when: openrc_flag }
+    - { role: create_samplevnfs_image, when: openrc_flag }
+  environment:
+    "{{ openrc | default({}) }}"
 
 
 - name: Start yardstick container on jumphost