summaryrefslogtreecommitdiffstats
path: root/ansible/install.yaml
diff options
context:
space:
mode:
authorStepan Andrushko <stepanx.andrushko@intel.com>2018-09-07 15:15:08 +0300
committerStepan Andrushko <stepanx.andrushko@intel.com>2018-11-15 23:10:31 +0200
commit85644d1a6d5e6af361367321b7805d69c7e7f26e (patch)
treeb59a0bf3a0e41eb8230520e109bcdedd7541c872 /ansible/install.yaml
parent11bfaf23160da0f0391a2152dddb19b3a0bae766 (diff)
Modify install.yaml to support Ubuntu 18
Modify install.yaml to be able to install Yardstick on the newest Ubuntu 18.04 LTS. Yardstick installation on Ubuntu 16 is still supported. Default version is Ubuntu 16.04 (xenial). JIRA: YARDSTICK-1413 Change-Id: Ic8aca0699645c68831ee739deeaeceef418075f5 Signed-off-by: Stepan Andrushko <stepanx.andrushko@intel.com>
Diffstat (limited to 'ansible/install.yaml')
-rw-r--r--ansible/install.yaml10
1 files changed, 3 insertions, 7 deletions
diff --git a/ansible/install.yaml b/ansible/install.yaml
index 0800ee534..079c65d31 100644
--- a/ansible/install.yaml
+++ b/ansible/install.yaml
@@ -21,7 +21,7 @@
pre_tasks:
- - name: Create NSB binaries directory, accesible to any user
+ - name: Create NSB binaries directory, accessible to any user
file:
path: "{{ nsb_dir }}"
state: directory
@@ -31,8 +31,8 @@
- installation_mode != inst_mode_container_pull
roles:
- - { role: add_repos_jumphost, when: installation_mode != inst_mode_container_pull }
- - { role: install_dependencies_jumphost, when: installation_mode != inst_mode_container_pull }
+ - add_repos_jumphost
+ - install_dependencies_jumphost
- { role: install_yardstick, when: installation_mode != inst_mode_container_pull }
- { role: configure_uwsgi, when: installation_mode != inst_mode_container_pull }
- { role: configure_nginx, when: installation_mode != inst_mode_container_pull }
@@ -142,10 +142,6 @@
tasks:
- include_role:
- name: install_dependencies_jumphost
- when: installation_mode == inst_mode_container_pull
-
- - include_role:
name: docker
when: installation_mode == inst_mode_container_pull