diff options
| author |   Justin chi <chigang@huawei.com> | 2016-11-28 06:56:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-11-28 06:56:36 +0000 |
| commit | f95408e87add65c17e57216ad7614155b0dd5402 (patch) | |
| tree | 86b74b1cfb5188eb0391a514687dbbffb8c89a01 | |
| parent | ba0e623c89d9db0d4b26b96d3f4e448d68bf7258 (diff) | |
| parent | da9fb976a12604b087d94912ad033185cd58fe1f (diff) | |
Merge "Fix the wait_for modules" into stable/colorado
| -rw-r--r-- | deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/moon-controller.yml | 2 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/keystone/tasks/keystone_config.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/moon-controller.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/moon-controller.yml index 7a507c88..95dd2e89 100644 --- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/moon-controller.yml +++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/moon-controller.yml @@ -142,7 +142,7 @@ ############################################# - name: wait for keystone ready - wait_for: port=35357 delay=3 timeout=10 host={{ internal_vip.ip }} + wait_for: port=35357 delay=3 timeout=10 host={{ internal_ip }} #- name: cron job to purge expired tokens hourly # cron: diff --git a/deploy/adapters/ansible/roles/keystone/tasks/keystone_config.yml b/deploy/adapters/ansible/roles/keystone/tasks/keystone_config.yml index 574ebabd..e7e9297e 100644 --- a/deploy/adapters/ansible/roles/keystone/tasks/keystone_config.yml +++ b/deploy/adapters/ansible/roles/keystone/tasks/keystone_config.yml @@ -12,7 +12,7 @@ shell: su -s /bin/sh -c 'keystone-manage db_sync' keystone - name: wait for keystone ready - wait_for: port=35357 delay=3 timeout=10 host={{ internal_vip.ip }} + wait_for: port=35357 delay=3 timeout=10 host={{ internal_ip }} - name: cron job to purge expired tokens hourly cron: |