Merge "Export ANSIBLE_CONFIG so we can make sure it's used by Ansible"
This commit is contained in:
commit
fdb35bb2ff
|
@ -482,6 +482,7 @@ virtualenv /tmp/ansible
|
||||||
devstack-tools==$DSTOOLS_VERSION ara
|
devstack-tools==$DSTOOLS_VERSION ara
|
||||||
export ANSIBLE=/tmp/ansible/bin/ansible
|
export ANSIBLE=/tmp/ansible/bin/ansible
|
||||||
export ANSIBLE_PLAYBOOK=/tmp/ansible/bin/ansible-playbook
|
export ANSIBLE_PLAYBOOK=/tmp/ansible/bin/ansible-playbook
|
||||||
|
export ANSIBLE_CONFIG="$WORKSPACE/ansible.cfg"
|
||||||
export DSCONF=/tmp/ansible/bin/dsconf
|
export DSCONF=/tmp/ansible/bin/dsconf
|
||||||
|
|
||||||
# Write inventory file with groupings
|
# Write inventory file with groupings
|
||||||
|
@ -496,7 +497,7 @@ for SUBNODE in $SUBNODES ; do
|
||||||
done
|
done
|
||||||
|
|
||||||
# Write ansible config file
|
# Write ansible config file
|
||||||
cat > "$WORKSPACE/ansible.cfg" <<EOF
|
cat > $ANSIBLE_CONFIG <<EOF
|
||||||
[defaults]
|
[defaults]
|
||||||
callback_plugins = $WORKSPACE/devstack-gate/playbooks/plugins/callback:/tmp/ansible/lib/python2.7/site-packages/ara/plugins/callbacks
|
callback_plugins = $WORKSPACE/devstack-gate/playbooks/plugins/callback:/tmp/ansible/lib/python2.7/site-packages/ara/plugins/callbacks
|
||||||
stdout_callback = devstack
|
stdout_callback = devstack
|
||||||
|
|
Loading…
Reference in New Issue