From 11e514c543b2a62ebb9ce09462c2eeec6bc0678f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Ollivier?= Date: Tue, 25 Jul 2017 11:02:51 +0200 Subject: [PATCH] Fix tools/vagrant_dev_env/vagrant.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It sets the correct working dir when calling scripts/env-setup.sh. It also stops sourcing /opt/stack/ansible/hacking/env-setup as it is no longer needed. It currently conforms with README.rst. Change-Id: If921b6b0df98d9e4e725b79168fbb3f500939362 Signed-off-by: Cédric Ollivier --- tools/vagrant_dev_env/vagrant.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/vagrant_dev_env/vagrant.yml b/tools/vagrant_dev_env/vagrant.yml index e90c42ba0..1a4ca6fee 100644 --- a/tools/vagrant_dev_env/vagrant.yml +++ b/tools/vagrant_dev_env/vagrant.yml @@ -75,13 +75,15 @@ file: path={{ansible_install_root}} state=directory owner=vagrant - name: Prepare VM for Bifrost - command: /home/vagrant/bifrost/scripts/env-setup.sh + command: scripts/env-setup.sh environment: - ANSIBLE_INSTALL_ROOT: "{{ansible_install_root}}" + ANSIBLE_INSTALL_ROOT: "{{ansible_install_root}}" + args: + chdir: /home/vagrant/bifrost - name: Install Bifrost - shell: source {{ansible_install_root}}/ansible/hacking/env-setup && ansible-playbook -vvvv -i inventory/localhost install.yaml -e network_interface={{network_interface}} + command: ansible-playbook -vvvv -i inventory/localhost install.yaml -e network_interface={{network_interface}} + environment: + PATH: "{{ansible_env.HOME}}/.local/bin:{{ansible_env.PATH}}" args: chdir: /home/vagrant/bifrost/playbooks - executable: /bin/bash -