From 62a5d6bfc8480dfd0bfa2d6937f31125ba443e56 Mon Sep 17 00:00:00 2001 From: Stepan Andrushko Date: Mon, 31 Dec 2018 12:54:40 +0200 Subject: Replace script to install.yaml in nsb_setup.sh Replace 'nsb_setup.yml' with 'install.yaml' in 'nsb_setup.sh'. Ansible script 'install.yaml' supports installations on Ubuntu 16/18 of Yardstick, packages dependencies and VM images. Add possibility to provide and add to OpenStack non-NSB VM image. JIRA: YARDSTICK-1577 Change-Id: I0cf7cbb354a5f389da432b05cb6f0b470fb5d8f1 Signed-off-by: Stepan Andrushko --- nsb_setup.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'nsb_setup.sh') diff --git a/nsb_setup.sh b/nsb_setup.sh index 335db8dd2..2e244cf00 100755 --- a/nsb_setup.sh +++ b/nsb_setup.sh @@ -131,9 +131,11 @@ pip install ansible==2.5.5 shade==1.22.2 docker-py==1.10.6 ANSIBLE_SCRIPTS="ansible" -cd ${ANSIBLE_SCRIPTS} &&\ +cd ${ANSIBLE_SCRIPTS} && \ ansible-playbook \ - -e img_property="nsb" \ - -e YARD_IMG_ARCH='amd64' ${extra_args}\ - -i install-inventory.ini nsb_setup.yml + -e IMAGE_PROPERTY='nsb' \ + -e OS_RELEASE='xenial' \ + -e INSTALLATION_MODE='container_pull' \ + -e YARD_IMAGE_ARCH='amd64' ${extra_args} \ + -i install-inventory.ini install.yaml -- cgit 1.2.3-korg