Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Remove unused methods in SampleVNF"
[yardstick.git]
/
ansible
/
nsb_setup.yml
diff --git
a/ansible/nsb_setup.yml
b/ansible/nsb_setup.yml
index
e79ccab
..
0149054
100644
(file)
--- a/
ansible/nsb_setup.yml
+++ b/
ansible/nsb_setup.yml
@@
-12,46
+12,38
@@
# See the License for the specific language governing permissions and
# limitations under the License.
---
# 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
vars:
YARD_IMG_ARCH: amd64
-- hosts: localhost
+- name: Install jumphost dependencies and configure docker
+ hosts: jumphost
+ environment:
+ "{{ proxy_env }}"
roles:
roles:
- - install_dependencies
+ - install_dependencies
_jumphost
- docker
- docker
-- include: build_yardstick_image.yml
- vars:
- YARD_IMG_ARCH: amd64
- release: xenial
- when: openrc_file is defined
-
-- include: clean_images.yml
+- name: "handle all openstack stuff when: openrc_file is defined"
+ include: prepare_openstack.yml
when: openrc_file is defined
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 }}"
- environment: "{{ openrc }}"
- when: openrc_file is defined
-
+- name: start yardstick container on jumphost
+ hosts: jumphost
+ tasks:
- name: Start yardstick container
docker_container:
name: yardstick
- name: Start yardstick container
docker_container:
name: yardstick
- image: opnfv/yardstick:latest
+ pull: yes
recreate: yes
recreate: yes
+ image: opnfv/yardstick:latest
state: started
restart_policy: always
state: started
restart_policy: always
- network_mode: host
- privileged: True
- interactive: True
+ privileged: yes
+ interactive: yes
volumes:
- "{{ openrc_file|default('/dev/null') }}:/etc/yardstick/openstack.creds:ro"
- /var/run/docker.sock:/var/run/docker.sock
volumes:
- "{{ openrc_file|default('/dev/null') }}:/etc/yardstick/openstack.creds:ro"
- /var/run/docker.sock:/var/run/docker.sock
- - /opt/:/opt
+ - /opt:/opt
+ - /etc/localtime:/etc/localtime:ro