summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-08 13:48:25 +0000
committerGerrit Code Review <review@openstack.org>2017-03-08 13:48:25 +0000
commitcdc47de271b92083c1e807b1772634ee4a54b1c2 (patch)
tree844adc0714bb4b95d49b52be6cd78582f9d7a83f
parentd8237529d9e8a148e2531b8757493ec475961038 (diff)
parented8c406fe393e4d883a00f6b20343288ac7b66df (diff)
Merge "Fix some issues when executing workload 'dockerswarm'."
-rwxr-xr-xworkloads/ansible/shade/dockerswarm/roles/prov_apply/tasks/main.yml14
1 files changed, 11 insertions, 3 deletions
diff --git a/workloads/ansible/shade/dockerswarm/roles/prov_apply/tasks/main.yml b/workloads/ansible/shade/dockerswarm/roles/prov_apply/tasks/main.yml
index f5df32e..50e63bf 100755
--- a/workloads/ansible/shade/dockerswarm/roles/prov_apply/tasks/main.yml
+++ b/workloads/ansible/shade/dockerswarm/roles/prov_apply/tasks/main.yml
@@ -9,7 +9,7 @@
9 9
10- name: Make certificate configuration file 10- name: Make certificate configuration file
11 copy: 11 copy:
12 src: templates/openssl.cnf 12 src: "templates/openssl.cnf"
13 dest: "/tmp/{{ env }}/{{ node_ip }}/keys/" 13 dest: "/tmp/{{ env }}/{{ node_ip }}/keys/"
14 14
15- name: Make service file 15- name: Make service file
@@ -29,11 +29,19 @@
29 dest: "/tmp/{{ env }}/{{ node_ip }}/keys/bootstrap.sh" 29 dest: "/tmp/{{ env }}/{{ node_ip }}/keys/bootstrap.sh"
30 when: swarmnode.openstack.private_v4 != "" 30 when: swarmnode.openstack.private_v4 != ""
31 31
32- name: Wait for ssh connection
33 wait_for:
34 host: "{{ node_ip }}"
35 port: 22
36 delay: 2
37 timeout: 300
38 search_regex: OpenSSH
39
32- name: Transfer configureation 40- name: Transfer configureation
33 shell: scp -r "/tmp/{{ env }}/{{ node_ip }}/keys" "core@{{ node_ip }}:/home/core" 41 shell: scp -o "StrictHostKeyChecking=no" -r "/tmp/{{ env }}/{{ node_ip }}/keys" "core@{{ node_ip }}:/home/core"
34 42
35- name: Transfer certificate file over to the nodes 43- name: Transfer certificate file over to the nodes
36 shell: scp -r "/tmp/{{ env }}/keys" "core@{{ node_ip }}:/home/core" 44 shell: scp -o "StrictHostKeyChecking=no" -r "/tmp/{{ env }}/keys" "core@{{ node_ip }}:/home/core"
37 45
38- name: Start services 46- name: Start services
39 shell: ssh "core@{{ node_ip }}" "sh keys/bootstrap.sh" 47 shell: ssh "core@{{ node_ip }}" "sh keys/bootstrap.sh"