openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Use global ansible.cfg for nodes-uuid playbook"

Browse Source
This commit is contained in:
Zuul 2018-07-27 03:24:46 +00:00 committed by Gerrit Code Review
commit e87fcba49d
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docker/services/ceph-ansible/ceph-base.yaml
View File

@ -420,9 +420,8 @@ outputs:
list_join:
- ' '
- - ANSIBLE_LOG_PATH="{{playbook_dir}}/ceph-ansible/nodes_uuid_command.log"
- ANSIBLE_SSH_RETRIES=3
- ANSIBLE_HOST_KEY_CHECKING=False
- DEFAULT_FORKS=25
- ANSIBLE_CONFIG="{{playbook_dir}}/ansible.cfg"
- ANSIBLE_REMOTE_TEMP=/tmp/nodes_uuid_tmp
- ansible-playbook
- '{% if ansible_ssh_private_key_file is defined %}--private-key {{ansible_ssh_private_key_file}}{% endif %}'
- '-i'
@ -437,14 +436,13 @@ outputs:
list_join:
- ' '
- - ANSIBLE_ACTION_PLUGINS=/usr/share/ceph-ansible/plugins/actions/
- ANSIBLE_CALLBACK_PLUGINS=/usr/share/ceph-ansible/plugins/callback/
- ANSIBLE_ROLES_PATH=/usr/share/ceph-ansible/roles/
- ANSIBLE_LOG_PATH="{{playbook_dir}}/ceph-ansible/ceph_ansible_command.log"
- ANSIBLE_LIBRARY=/usr/share/ceph-ansible/library/
- ANSIBLE_RETRY_FILES_ENABLED=False
- ANSIBLE_SSH_RETRIES=3
- ANSIBLE_HOST_KEY_CHECKING=False
- DEFAULT_FORKS=25
- ANSIBLE_CONFIG=/usr/share/ceph-ansible/ansible.cfg
- ANSIBLE_REMOTE_TEMP=/tmp/ceph_ansible_tmp
- ANSIBLE_FORKS=25
- yaql:
data: {get_param: CephAnsibleEnvironmentVariables}
expression: $.data.items().select($[0] + '=' + $[1]).join(' ')