openstack
/
tripleo-image-elements
Code Issues Proposed changes

Merge "Allow ansible venv path to be customized"

This commit is contained in:
Jenkins 2014-11-20 00:59:15 +00:00 committed by Gerrit Code Review
parent 9174b4ef21 a89781a6c3
commit 2e03a7add7
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elements/ansible/environment.d/10-ansible-venv-dir.bash Executable file
View File

@ -0,0 +1,4 @@
#!/bin/bash
set -ue
export ANSIBLE_VENV_DIR=${ANSIBLE_VENV_DIR:-"/opt/stack/venvs/ansible"}

13
elements/ansible/install.d/ansible-source-install/30-ansible-source
View File

@ -21,16 +21,15 @@ set -o pipefail
install-packages build-essential libssl-dev libyaml-dev python-dev libxml2-dev libxslt-dev
VENV=/opt/stack/venvs/ansible
virtualenv $VENV
virtualenv $ANSIBLE_VENV_DIR
set +u
source $VENV/bin/activate
source $ANSIBLE_VENV_DIR/bin/activate
set -u
$VENV/bin/pip install paramiko PyYAML jinja2 httplib2
$ANSIBLE_VENV_DIR/bin/pip install paramiko PyYAML jinja2 httplib2
$VENV/bin/pip install ansible==1.7.0
$ANSIBLE_VENV_DIR/bin/pip install ansible==1.7.0
ln -s $VENV/bin/ansible /usr/local/bin/ansible
ln -s $VENV/bin/ansible-playbook /usr/local/bin/ansible-playbook
ln -s $ANSIBLE_VENV_DIR/bin/ansible /usr/local/bin/ansible
ln -s $ANSIBLE_VENV_DIR/bin/ansible-playbook /usr/local/bin/ansible-playbook