diff --git a/scripts/bootstrap-ansible.sh b/scripts/bootstrap-ansible.sh index 9ed94f3f30..b8466d59a0 100755 --- a/scripts/bootstrap-ansible.sh +++ b/scripts/bootstrap-ansible.sh @@ -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 diff --git a/scripts/os-ansible-role-requirements.py b/scripts/os-ansible-role-requirements.py index d19a94195d..25905bdd89 100755 --- a/scripts/os-ansible-role-requirements.py +++ b/scripts/os-ansible-role-requirements.py @@ -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