openstack/openstack-ansible
Code Issues Proposed changes

Merge "Fix incorrect variables in ansible role scripts"

Browse Source
This commit is contained in:
Jenkins
2015-03-20 22:39:46 +00:00
committed by Gerrit Code Review
parent cd0cb83587 7e0f00307c
commit 7e7fa5c06b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/bootstrap-ansible.sh
View File

@@ -70,7 +70,7 @@ fi
pip2 install "${ANSIBLE_WORKING_DIR}" || pip install "${ANSIBLE_WORKING_DIR}"
# Update dependent roles
if [ -f "ansible-role-requirements.yml" ];then
if [ -f "${ANSIBLE_ROLE_FILE}" ];then
# Update or create the roles manifest
if [ "${UPDATE_ANSIBLE_REQUIREMENTS}" == "yes" ];then
./scripts/os-ansible-role-requirements.py --requirement-file ${ANSIBLE_ROLE_FILE} update

4
scripts/os-ansible-role-requirements.py
View File

@@ -253,8 +253,8 @@ def requirements_file(args):
)
)
if not os.path.isdir(os.path.dirname(args['requirement_file'])):
os.makedirs(os.path.dirname(args['requirement_file']))
if not os.path.isdir(os.path.dirname(requirement_file)):
os.makedirs(os.path.dirname(requirement_file))
return requirement_file