X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ansible%2Fnsb_setup.yml;h=bfe5d2349221ef23fba8a22b46c87bfedc49a4be;hb=0182d472d35a78c460610f5e35018416f857059b;hp=90fba0b1ec2503badd5cba120d29521c446e4a49;hpb=e02b893a0be2a857cc621c8943bc84b8a679763f;p=yardstick.git

diff --git a/ansible/nsb_setup.yml b/ansible/nsb_setup.yml
index 90fba0b1e..bfe5d2349 100644
--- a/ansible/nsb_setup.yml
+++ b/ansible/nsb_setup.yml
@@ -12,37 +12,26 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ---
-- include: ubuntu_server_baremetal_deploy_samplevnfs.yml
-  vars:
-    YARD_IMG_ARCH: amd64
-
-- hosts: localhost
-  roles:
-    - install_dependencies
-    - docker
-
-- include: build_yardstick_image.yml
-  vars:
-    YARD_IMG_ARCH: amd64
-    release: xenial
-  when: openrc_file is defined
+#- 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
 
-- include: clean_images.yml
+- name: "handle all openstack stuff when: openrc_file is defined"
+  include: prepare_openstack.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