Merge "Ensure ssh key is active before returning from create_admin_via_nova"

This commit is contained in:
Jenkins 2017-10-14 10:23:01 +00:00 committed by Gerrit Code Review
commit ea57722776
2 changed files with 28 additions and 0 deletions

View File

@ -74,6 +74,7 @@ workflows:
input: input:
queue_name: <% $.queue_name %> queue_name: <% $.queue_name %>
tasks: <% $.create_admin_tasks %> tasks: <% $.create_admin_tasks %>
overcloud_admin: <% $.overcloud_admin %>
# SSH variant # SSH variant
create_admin_via_ssh: create_admin_via_ssh:
@ -88,6 +89,7 @@ workflows:
input: input:
- tasks - tasks
- queue_name: tripleo - queue_name: tripleo
- overcloud_admin: tripleo-admin
tags: tags:
- tripleo-common-managed - tripleo-common-managed
tasks: tasks:
@ -99,6 +101,7 @@ workflows:
create_admin: create_admin:
workflow: tripleo.deployment.v1.deploy_on_server workflow: tripleo.deployment.v1.deploy_on_server
on-success: get_privkey
with-items: server in <% $.servers %> with-items: server in <% $.servers %>
input: input:
server_name: <% $.server.name %> server_name: <% $.server.name %>
@ -111,6 +114,30 @@ workflows:
connection: local connection: local
tasks: <% json_pp($.tasks) %> tasks: <% json_pp($.tasks) %>
get_privkey:
action: tripleo.validations.get_privkey
on-success: wait_for_occ
publish:
privkey: <% task(get_privkey).result %>
wait_for_occ:
action: tripleo.ansible-playbook
input:
inventory:
overcloud:
hosts: <% $.servers.addresses.ctlplane.addr.flatten().toDict($, {}) %>
remote_user: <% $.overcloud_admin %>
ssh_private_key: <% $.privkey %>
ssh_common_args: '-o StrictHostKeyChecking=no'
playbook:
- hosts: overcloud
gather_facts: no
tasks:
- name: wait for connection
wait_for_connection:
sleep: 5
timeout: 300
create_admin_via_ssh: create_admin_via_ssh:
input: input:
- tasks - tasks

View File

@ -16,6 +16,7 @@ workflows:
ANSIBLE_RETRY_FILES_ENABLED: 'False' ANSIBLE_RETRY_FILES_ENABLED: 'False'
ANSIBLE_LOG_PATH: /var/log/mistral/ceph-install-workflow.log ANSIBLE_LOG_PATH: /var/log/mistral/ceph-install-workflow.log
ANSIBLE_LIBRARY: /usr/share/ceph-ansible/library/ ANSIBLE_LIBRARY: /usr/share/ceph-ansible/library/
ANSIBLE_SSH_RETRIES: '3'
- ceph_ansible_extra_vars: {} - ceph_ansible_extra_vars: {}
- ceph_ansible_playbook: /usr/share/ceph-ansible/site-docker.yml.sample - ceph_ansible_playbook: /usr/share/ceph-ansible/site-docker.yml.sample
tags: tags: