From 1c4a5e50bd7bff8f2e7b35e4e1a7861f08dd4598 Mon Sep 17 00:00:00 2001
From: caoyuan <cao.yuan@99cloud.net>
Date: Tue, 14 Mar 2017 10:01:37 +0800
Subject: [PATCH] Add the missing port prechecks for keystone

Change-Id: Ic2890d0ea2dd0927b327b880bf25532fbb2efe07
---
 ansible/roles/keystone/tasks/precheck.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/ansible/roles/keystone/tasks/precheck.yml b/ansible/roles/keystone/tasks/precheck.yml
index 31f8c50802..449e5cc89a 100644
--- a/ansible/roles/keystone/tasks/precheck.yml
+++ b/ansible/roles/keystone/tasks/precheck.yml
@@ -3,6 +3,7 @@
   kolla_container_facts:
     name:
       - keystone
+      - keystone_ssh
   register: container_facts
 
 - name: Checking free port for Keystone Admin
@@ -25,6 +26,19 @@
     - container_facts['keystone'] is not defined
     - inventory_hostname in groups['keystone']
 
+- name: Checking free port for Keystone SSH
+  vars:
+    keystone_ssh: "{{ keystone_services['keystone-ssh'] }}"
+  wait_for:
+    host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
+    port: "{{ keystone_ssh_port }}"
+    connect_timeout: 1
+    state: stopped
+  when:
+    - container_facts['keystone_ssh'] is not defined
+    - keystone_ssh.enabled | bool
+    - inventory_hostname in groups['keystone']
+
 - name: Checking fernet_token_expiry in globals.yml. Update fernet_token_expiry to allowed value if this task fails
   run_once: true
   local_action: command awk '/^fernet_token_expiry/ { print $2 }' "{{ CONFIG_DIR | default('/etc/kolla') }}/globals.yml"