X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ansible%2Fnsb_setup.yml;h=fcde1d1b233254336e8575003954974300325019;hb=244c4846fb5fccdd0d93c448c6a46b14da8f7b76;hp=90fba0b1ec2503badd5cba120d29521c446e4a49;hpb=395387185000a8d919499e25d7f1915e7a7f56e7;p=yardstick.git

diff --git a/ansible/nsb_setup.yml b/ansible/nsb_setup.yml
index 90fba0b1e..fcde1d1b2 100644
--- a/ansible/nsb_setup.yml
+++ b/ansible/nsb_setup.yml
@@ -12,43 +12,32 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ---
-- include: ubuntu_server_baremetal_deploy_samplevnfs.yml
+- name: Prepare baremetal machine
+  include: ubuntu_server_baremetal_deploy_samplevnfs.yml
   vars:
     YARD_IMG_ARCH: amd64
 
-- hosts: localhost
+- name: Install jumphost dependencies and configure docker
+  hosts: jumphost
+  environment:
+    "{{ proxy_env }}"
   roles:
-    - install_dependencies
+    - install_dependencies_jumphost
     - docker
 
-- include: build_yardstick_image.yml
-  vars:
-    YARD_IMG_ARCH: amd64
-    release: xenial
+- name: "handle all openstack stuff when: openrc_file is defined"
+  include: prepare_openstack.yml
   when: openrc_file is defined
 
-- include: clean_images.yml
-  when: openrc_file is defined
-
-- hosts: localhost
-  post_tasks:
-    - os_image:
-        name: yardstick-samplevnfs
-        is_public: yes
-        disk_format: qcow2
-        container_format: bare
-        filename: "{{ raw_imgfile }}"
-        properties:
-          hw_vif_multiqueue_enabled: true
-      environment: "{{ openrc }}"
-      when: openrc_file is defined
-
+- name: start yardstick container on jumphost
+  hosts: jumphost
+  tasks:
     - name: Start yardstick container
       docker_container:
         name: yardstick
         pull: yes
         recreate: yes
-        image: opnfv/yardstick:latest
+        image: "{{ yardstick_docker_image|default('opnfv/yardstick:latest') }}"
         state: started
         restart_policy: always
         privileged: yes