openstack
/
tripleo-quickstart
Code Issues Proposed changes

Merge "Don't hardcode .quickstart since this is configurable"

This commit is contained in:
Zuul 2017-12-01 08:14:58 +00:00 committed by Gerrit Code Review
parent 3a902f9b3b aa5d937944
commit 1ebdbd7909
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/tripleo-inventory/tasks/inventory.yml
View File

@ -101,7 +101,7 @@
#required for regeneration of ssh.config.ansible
- name: set undercloud ssh proxy command
set_fact: undercloud_ssh_proxy_command="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no
-o ConnectTimeout=60 -i {{ hostvars['localhost'].ansible_user_dir }}/.quickstart/id_rsa_virt_power
-o ConnectTimeout=60 -i {{ local_working_dir }}/id_rsa_virt_power
{{ ssh_user }}@{{ hostvars['localhost'].ansible_default_ipv4.address }}
-W {{ undercloud_ip }}:22"
when: hostvars[groups['virthost'][0]].ansible_private_key_file is not defined and undercloud_ip is defined

8
roles/tripleo-inventory/templates/ssh_config_localhost.j2
View File

@ -1,13 +1,13 @@
Host undercloud-root
Hostname {{ undercloud_ip }}
IdentityFile {{ hostvars['localhost'].ansible_user_dir }}/.quickstart/id_rsa_undercloud
IdentityFile {{ local_working_dir }}/id_rsa_undercloud
IdentitiesOnly yes
User root
StrictHostKeyChecking no
Host undercloud
Hostname {{ undercloud_ip }}
IdentityFile {{ hostvars['localhost'].ansible_user_dir }}/.quickstart/id_rsa_undercloud
IdentityFile {{ local_working_dir }}/id_rsa_undercloud
IdentitiesOnly yes
User {{ undercloud_user }}
StrictHostKeyChecking no
@ -18,8 +18,8 @@ Host undercloud
Host {{ host }}
Hostname {{ hostvars[host].ansible_fqdn }}
ProxyCommand ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ConnectTimeout=60 -F {{ hostvars['localhost'].ansible_user_dir }}/.quickstart/ssh.config.local.ansible undercloud -W {{ hostvars[host].ansible_fqdn }}:22
IdentityFile {{ hostvars['localhost'].ansible_user_dir }}/.quickstart/id_rsa_overcloud
ProxyCommand ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ConnectTimeout=60 -F {{ local_working_dir }}/ssh.config.local.ansible undercloud -W {{ hostvars[host].ansible_fqdn }}:22
IdentityFile {{ local_working_dir }}/id_rsa_overcloud
User {{ overcloud_user | default('heat-admin') }}
StrictHostKeyChecking no
UserKnownHostsFile=/dev/null