Merge "Fix the "Creating the Zun service and endpoint" failed"

This commit is contained in:
Jenkins 2017-04-14 05:37:28 +00:00 committed by Gerrit Code Review
commit 55b51c2a3e

View File

@ -3,8 +3,8 @@
kolla_toolbox: kolla_toolbox:
module_name: "kolla_keystone_service" module_name: "kolla_keystone_service"
module_args: module_args:
service_name: "{{ item.service_name }}" service_name: "zun"
service_type: "{{ item.service_type }}" service_type: "container"
description: "Container Service" description: "Container Service"
endpoint_region: "{{ openstack_region_name }}" endpoint_region: "{{ openstack_region_name }}"
url: "{{ item.url }}" url: "{{ item.url }}"
@ -13,10 +13,6 @@
auth: "{{ '{{ openstack_zun_auth }}' }}" auth: "{{ '{{ openstack_zun_auth }}' }}"
module_extra_vars: module_extra_vars:
openstack_zun_auth: "{{ openstack_zun_auth }}" openstack_zun_auth: "{{ openstack_zun_auth }}"
register: zun_endpoint
until: zun_endpoint|success
retries: 10
delay: 5
run_once: True run_once: True
with_items: with_items:
- {'interface': 'admin', 'url': '{{ zun_admin_endpoint }}'} - {'interface': 'admin', 'url': '{{ zun_admin_endpoint }}'}
@ -35,8 +31,4 @@
auth: "{{ '{{ openstack_zun_auth }}' }}" auth: "{{ '{{ openstack_zun_auth }}' }}"
module_extra_vars: module_extra_vars:
openstack_zun_auth: "{{ openstack_zun_auth }}" openstack_zun_auth: "{{ openstack_zun_auth }}"
register: zun_user
until: zun_user|success
retries: 10
delay: 5
run_once: True run_once: True