From 90bf34f0aa99fbf4ea443d1d4d34bdbb60cb1e04 Mon Sep 17 00:00:00 2001
From: caoyuan <cao.yuan@99cloud.net>
Date: Thu, 30 Mar 2017 23:45:30 +0800
Subject: [PATCH] Fix the "Creating the Zun service and endpoint" failed

- fix the zun deploy failed
- remove the unnecessary register

Change-Id: I06bbad44de3f391a1c8939e8a587feababebc986
Closes-Bug: #1677665
---
 ansible/roles/zun/tasks/register.yml | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/ansible/roles/zun/tasks/register.yml b/ansible/roles/zun/tasks/register.yml
index f44951263a..40b6609e55 100644
--- a/ansible/roles/zun/tasks/register.yml
+++ b/ansible/roles/zun/tasks/register.yml
@@ -3,8 +3,8 @@
   kolla_toolbox:
     module_name: "kolla_keystone_service"
     module_args:
-      service_name: "{{ item.service_name }}"
-      service_type: "{{ item.service_type }}"
+      service_name: "zun"
+      service_type: "container"
       description: "Container Service"
       endpoint_region: "{{ openstack_region_name }}"
       url: "{{ item.url }}"
@@ -13,10 +13,6 @@
       auth: "{{ '{{ openstack_zun_auth }}' }}"
     module_extra_vars:
       openstack_zun_auth: "{{ openstack_zun_auth }}"
-  register: zun_endpoint
-  until: zun_endpoint|success
-  retries: 10
-  delay: 5
   run_once: True
   with_items:
     - {'interface': 'admin', 'url': '{{ zun_admin_endpoint }}'}
@@ -35,8 +31,4 @@
       auth: "{{ '{{ openstack_zun_auth }}' }}"
     module_extra_vars:
       openstack_zun_auth: "{{ openstack_zun_auth }}"
-  register: zun_user
-  until: zun_user|success
-  retries: 10
-  delay: 5
   run_once: True