diff options
| author |   Stepan Andrushko <stepanx.andrushko@intel.com> | 2018-12-24 19:26:39 +0200 |
|---|---|---|
| committer | Stepan Andrushko <stepanx.andrushko@intel.com> | 2018-12-28 15:41:43 +0200 |
| commit | e2f48a4ac921ac56827a98ffa51545c7095c5a3f (patch) | |
| tree | 44da08fe778183ae7513c823e4337518289b18ef /ansible | |
| parent | b122686cb06e89420e9d8141df535f6c43de29ab (diff) | |
Sync up 'install.yaml' with 'nsb_setup.yml'
Add support for barometer container. Add VM image to OpenStack.
JIRA: YARDSTICK-1573
Change-Id: I7946f080f93bb69b0380c9ea7f4d7e04cb284c15
Signed-off-by: Stepan Andrushko <stepanx.andrushko@intel.com>
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/install.yaml | 37 | ||||
| -rwxr-xr-x | ansible/roles/install_dependencies_jumphost/tasks/Debian.yml | 10 |
2 files changed, 41 insertions, 6 deletions
diff --git a/ansible/install.yaml b/ansible/install.yaml index 0c7ad7e92..e60c1485f 100644 --- a/ansible/install.yaml +++ b/ansible/install.yaml @@ -95,9 +95,12 @@ - install_pmu_tools - download_collectd - install_collectd + - docker + - barometer_collectd -- hosts: jumphost +- name: Prepare to build VM + hosts: jumphost become: yes vars: img_prop_item: "{{ IMG_PROPERTY }}" @@ -111,7 +114,8 @@ when: installation_mode != inst_mode_container -- hosts: chroot_image +- name: Build VM in chroot + hosts: chroot_image connection: chroot become: yes vars: @@ -126,7 +130,8 @@ when: installation_mode != inst_mode_container -- hosts: jumphost +- name: Clear up after VM is built + hosts: jumphost become: yes tasks: @@ -137,11 +142,33 @@ when: installation_mode != inst_mode_container -- name: start yardstick container on jumphost +- hosts: jumphost + vars_files: + - yardstick_config.yml + + roles: + - { role: convert_openrc, when: openrc_file is defined } + + +- name: Add OpenStack variables, image + hosts: jumphost + vars_files: + - yardstick_config.yml + environment: + "{{ openrc }}" + + roles: + - { role: clean_images, when: openrc_file is defined } + - { role: clean_flavors, when: openrc_file is defined } + - { role: create_samplevnfs_image, when: openrc_file is defined } + + +- name: Start yardstick container on jumphost hosts: jumphost tasks: - - include_role: + - name: Install docker needed to pull Yardstick container + include_role: name: docker when: installation_mode == inst_mode_container_pull diff --git a/ansible/roles/install_dependencies_jumphost/tasks/Debian.yml b/ansible/roles/install_dependencies_jumphost/tasks/Debian.yml index 6c3900d26..a229cc1a2 100755 --- a/ansible/roles/install_dependencies_jumphost/tasks/Debian.yml +++ b/ansible/roles/install_dependencies_jumphost/tasks/Debian.yml @@ -91,8 +91,16 @@ - ansible_distribution == 'Ubuntu' - ansible_distribution_major_version|int >= 17 +- name: Uninstall docker as it conflicts with docker-py + pip: + name: + - docker + state: absent + - name: Install required docker-py module pip: - name: docker-py + name: + - docker-py + - shade state: latest environment: "{{ proxy_env }}" |