diff options
| author | Ryan Cook <rcook@redhat.com> | 2017-07-27 16:35:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-27 16:35:47 -0400 |
| commit | 7a272500a5096749d586b01ba34a7d109e71407c (patch) | |
| tree | 4c43dfdfefcc139249458606c9c4edefc1c38c32 /playbooks/provisioning/openstack/provision-openstack.yml | |
| parent | c74611e99ec00bd4a3dbb67e972b8deed206fa7d (diff) | |
| parent | 62001e19f4819f8454aa16bb8daedf303217440c (diff) | |
| download | openshift-7a272500a5096749d586b01ba34a7d109e71407c.tar.gz openshift-7a272500a5096749d586b01ba34a7d109e71407c.tar.bz2 openshift-7a272500a5096749d586b01ba34a7d109e71407c.tar.xz openshift-7a272500a5096749d586b01ba34a7d109e71407c.zip | |
Merge branch 'master' into loggin-aws
Diffstat (limited to 'playbooks/provisioning/openstack/provision-openstack.yml')
| -rw-r--r-- | playbooks/provisioning/openstack/provision-openstack.yml | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/playbooks/provisioning/openstack/provision-openstack.yml b/playbooks/provisioning/openstack/provision-openstack.yml index 0c673af2f..6ec944d56 100644 --- a/playbooks/provisioning/openstack/provision-openstack.yml +++ b/playbooks/provisioning/openstack/provision-openstack.yml @@ -8,28 +8,24 @@ - include: pre_tasks.yml roles: - role: openstack-stack + - role: static_inventory + 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 - -- hosts: cluster_hosts - name: Wait for the the nodes to come up - become: False - gather_facts: False - tasks: - - wait_for_connection: - -- hosts: cluster_hosts - gather_facts: True - tasks: - - name: Debug hostvar - debug: - msg: "{{ hostvars[inventory_hostname] }}" - verbosity: 2 + - 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 |