diff options
| author | Bogdan Dobrelya <bdobreli@redhat.com> | 2017-07-27 15:39:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-27 15:39:42 +0200 |
| commit | 1b76aeba44ce8cb1120a6659c375fe8b4c87f919 (patch) | |
| tree | 4c43dfdfefcc139249458606c9c4edefc1c38c32 /playbooks/provisioning/openstack/provision-openstack.yml | |
| parent | 5cbcfd231054b0f64d9bc70064ecdb892cfbaec5 (diff) | |
| parent | df8f5f0e251a014ab30dabd62c17e151b7fe36e8 (diff) | |
| download | openshift-1b76aeba44ce8cb1120a6659c375fe8b4c87f919.tar.gz openshift-1b76aeba44ce8cb1120a6659c375fe8b4c87f919.tar.bz2 openshift-1b76aeba44ce8cb1120a6659c375fe8b4c87f919.tar.xz openshift-1b76aeba44ce8cb1120a6659c375fe8b4c87f919.zip | |
Merge pull request #535 from bogdando/bastion_inventory
Options for bastion, SSH config, static inventory autogeneration
Diffstat (limited to 'playbooks/provisioning/openstack/provision-openstack.yml')
| -rw-r--r-- | playbooks/provisioning/openstack/provision-openstack.yml | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/playbooks/provisioning/openstack/provision-openstack.yml b/playbooks/provisioning/openstack/provision-openstack.yml index 0cac37aaf..6ec944d56 100644 --- a/playbooks/provisioning/openstack/provision-openstack.yml +++ b/playbooks/provisioning/openstack/provision-openstack.yml @@ -12,13 +12,20 @@ when: openstack_inventory|default('static') == 'static' inventory_path: "{{ openstack_inventory_path|default(inventory_dir) }}" private_ssh_key: "{{ openstack_private_ssh_key|default('~/.ssh/id_rsa') }}" + ssh_config_path: "{{ openstack_ssh_config_path|default('/tmp/ssh.config.openshift.ansible' + '.' + stack_name) }}" + ssh_user: "{{ ansible_user }}" -- name: Refresh Server inventory +- name: Refresh Server inventory or exit to apply SSH config hosts: localhost connection: local become: False gather_facts: False tasks: - - meta: refresh_inventory + - name: Exit to apply SSH config for a bastion + meta: end_play + when: openstack_use_bastion|default(False)|bool + - name: Refresh Server inventory + meta: refresh_inventory - include: post-provision-openstack.yml + when: not openstack_use_bastion|default(False)|bool |