Merge "Suppress log outputs in test_ixnet_api"

[yardstick.git] / ansible / nsb_setup.yml

diff --git a/ansible/nsb_setup.yml b/ansible/nsb_setup.yml
index bfe5d23..fcde1d1 100644 (file)
--- 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_jumphost
+    - docker
 
 - name: "handle all openstack stuff when: openrc_file is defined"
   include: prepare_openstack.yml
@@ -37,7 +37,7 @@
         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