openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix skydive deployment not able to read ssh private key"

This commit is contained in:
Zuul 2019-04-04 03:34:01 +00:00 committed by Gerrit Code Review
parent 046973baba 3c49d1c76c
commit 756b689fc3
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extraconfig/services/skydive-analyzer.yaml
View File

@ -110,6 +110,7 @@ outputs:
skydive_os_auth_url: {{os_auth_url}}/v3
skydive_os_service_region_name: {{os_region_name}}
skydive_deployment_mode: container
skydive_deployment_source: tripleo
skydive_flow_protocol: websocket
skydive_topology_probes:
- neutron
@ -160,8 +161,10 @@ outputs:
set -e
ANSIBLE_CONFIG="{{playbook_dir}}/ansible.cfg"
ANSIBLE_HOST_KEY_CHECKING=False
ansible-playbook
{% if ansible_ssh_private_key_file is defined %}--private-key '{{ansible_ssh_private_key_file}}'{% endif %}
-i '{{playbook_dir}}/skydive/inventory.yml'
--extra-vars '@{{playbook_dir}}/skydive/global_defaults.yml'
--extra-vars '@{{playbook_dir}}/skydive/global_vars.yml'
@ -170,6 +173,7 @@ outputs:
mode: 0700
- name: run skydive-deploy.sh (immediate log at {{playbook_dir}}/skydive/playbook.log)
become: true
shell: |
{{playbook_dir}}/skydive/skydive-deploy.sh 2>&1 | tee {{playbook_dir}}/skydive/playbook.log
exit ${PIPESTATUS[0]}