summaryrefslogtreecommitdiffstats
path: root/ansible/nsb_setup.yml
diff options
context:
space:
mode:
authorRoss Brattain <ross.b.brattain@intel.com>2017-12-22 10:52:13 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-12-22 10:52:13 +0000
commit9bef739e89f3b230c9e0a53c2286a440017ec948 (patch)
tree35cf9d6b35cb53fa006c047ec52e5d1270adbdc8 /ansible/nsb_setup.yml
parent6459403fbd505549f13190a28eeeb15289945850 (diff)
parent057b1a79717c12eb283baeed94963cda2ff26df8 (diff)
Merge "Bugfix:proxy env, ansible multinode support"
Diffstat (limited to 'ansible/nsb_setup.yml')
-rw-r--r--ansible/nsb_setup.yml45
1 files changed, 17 insertions, 28 deletions
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