diff options
| author | Tomas Sedovic <tomas@sedovic.cz> | 2017-09-19 16:36:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-19 16:36:57 +0200 |
| commit | 288fef2dd2d74baab729d7c8b628a32d337da9bc (patch) | |
| tree | 558e830cbe3ed0af12e3a576ba3d344194f36bd3 /roles | |
| parent | 040f77745669046c65038250cb0cb0be1562c88d (diff) | |
| download | openshift-288fef2dd2d74baab729d7c8b628a32d337da9bc.tar.gz openshift-288fef2dd2d74baab729d7c8b628a32d337da9bc.tar.bz2 openshift-288fef2dd2d74baab729d7c8b628a32d337da9bc.tar.xz openshift-288fef2dd2d74baab729d7c8b628a32d337da9bc.zip | |
Empty ssh (#729)
* Make `openstack_private_ssh_key` optional
Before this, the deployer could not reasonably rely on their own SSH
configuration or e.g. using the `--private-key` option to
ansible-playbook because we always wrote the `ansible_private_key_file`
value in the static inventory.
This change makes the `openstack_private_ssh_key` variable truly
optional: if it's not set, the static inventory will not configure the
SSH key and will just rely on the existing configuration.
* Update the openstack e2e CI
It no longer sets the SSH keys explicitly -- which should just work with
the previous commit.
* Put back the `openstack_ssh_public_key` in CI
This is the option we actually need to keep. This sholud fix the CI
failures.
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/static_inventory/templates/inventory.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/static_inventory/templates/inventory.j2 b/roles/static_inventory/templates/inventory.j2 index 2245963c0..8863fb7c4 100644 --- a/roles/static_inventory/templates/inventory.j2 +++ b/roles/static_inventory/templates/inventory.j2 @@ -12,7 +12,7 @@ %} public_v4={{ hostvars[host]['public_v4'] }}{% endif %} {% if 'ansible_user' in hostvars[host] %} ansible_user={{ hostvars[host]['ansible_user'] }}{% endif %} -{% if 'ansible_private_key_file' in hostvars[host] +{% if 'ansible_private_key_file' in hostvars[host] and hostvars[host]['ansible_private_key_file'] %} ansible_private_key_file={{ hostvars[host]['ansible_private_key_file'] }}{% endif %} {% if use_bastion|bool and 'ansible_ssh_extra_args' in hostvars[host] %} ansible_ssh_extra_args={{ hostvars[host]['ansible_ssh_extra_args']|quote }}{% endif %} openshift_hostname={{ host }} |