Remove delegate_to from service-ks-register tasks

This was actually not present in the original tasks, I'm not sure how it
crept in. Using it could force delegating to a failed host.

Also use a block in the service-ks-register role to avoid repeating the
run_once and become arguments.

Change-Id: Ie4e14b1cfb0167a2126685784b6a8f7262393f63

ansible/roles/service-ks-register/defaults/main.yml

@@ -5,7 +5,6 @@ service_ks_cacert: "{{ openstack_cacert }}"
 service_ks_register_interface: "{{ openstack_interface }}"
 service_ks_register_endpoint_region: "{{ openstack_region_name }}"
 service_ks_register_domain: "default"
-service_ks_register_delegate_host: "{{ groups['control'][0] }}"
 # A list of services to register with Keystone. Each service definition should
 # provide the following fields:
 # 'name'

ansible/roles/service-ks-register/tasks/main.yml

@@ -1,6 +1,6 @@
 ---
-- name: "{{ project_name }} | Creating services"
+- block:
-  become: true
+    - name: "{{ project_name }} | Creating services"
       kolla_toolbox:
         module_name: "os_keystone_service"
         module_args:
@@ -11,9 +11,7 @@
           auth: "{{ service_ks_register_auth }}"
           interface: "{{ service_ks_register_interface }}"
           cacert: "{{ service_ks_cacert }}"
-  run_once: True
       loop: "{{ service_ks_register_services }}"
-  delegate_to: "{{ service_ks_register_delegate_host }}"
       loop_control:
         label:
           name: "{{ item.name }}"
@@ -23,8 +21,7 @@
       retries: "{{ service_ks_register_retries }}"
       delay: "{{ service_ks_register_delay }}"
 
-- name: "{{ project_name }} | Creating endpoints"
+    - name: "{{ project_name }} | Creating endpoints"
-  become: true
       kolla_toolbox:
         module_name: "os_keystone_endpoint"
         module_args:
@@ -36,11 +33,9 @@
           auth: "{{ service_ks_register_auth }}"
           interface: "{{ service_ks_register_interface }}"
           cacert: "{{ service_ks_cacert }}"
-  run_once: True
       with_subelements:
         - "{{ service_ks_register_services }}"
         - endpoints
-  delegate_to: "{{ service_ks_register_delegate_host }}"
       loop_control:
         label:
           service: "{{ item.0.name }}"
@@ -51,8 +46,7 @@
       retries: "{{ service_ks_register_retries }}"
       delay: "{{ service_ks_register_delay }}"
 
-- name: "{{ project_name }} | Creating projects"
+    - name: "{{ project_name }} | Creating projects"
-  become: true
       kolla_toolbox:
         module_name: "os_project"
         module_args:
@@ -62,16 +56,13 @@
           auth: "{{ service_ks_register_auth }}"
           interface: "{{ service_ks_register_interface }}"
           cacert: "{{ service_ks_cacert }}"
-  run_once: True
       with_items: "{{ service_ks_register_users | map(attribute='project') | unique | list }}"
-  delegate_to: "{{ service_ks_register_delegate_host }}"
       register: service_ks_register_result
       until: service_ks_register_result is success
       retries: "{{ service_ks_register_retries }}"
       delay: "{{ service_ks_register_delay }}"
 
-- name: "{{ project_name }} | Creating users"
+    - name: "{{ project_name }} | Creating users"
-  become: true
       kolla_toolbox:
         module_name: "os_user"
         module_args:
@@ -83,9 +74,7 @@
           auth: "{{ service_ks_register_auth }}"
           interface: "{{ service_ks_register_interface }}"
           cacert: "{{ service_ks_cacert }}"
-  run_once: True
       with_items: "{{ service_ks_register_users }}"
-  delegate_to: "{{ service_ks_register_delegate_host }}"
       loop_control:
         label:
           user: "{{ item.user }}"
@@ -95,8 +84,7 @@
       retries: "{{ service_ks_register_retries }}"
       delay: "{{ service_ks_register_delay }}"
 
-- name: "{{ project_name }} | Creating roles"
+    - name: "{{ project_name }} | Creating roles"
-  become: true
       kolla_toolbox:
         module_name: "os_keystone_role"
         module_args:
@@ -105,16 +93,13 @@
           auth: "{{ service_ks_register_auth }}"
           interface: "{{ service_ks_register_interface }}"
           cacert: "{{ service_ks_cacert }}"
-  run_once: True
       with_items: "{{ service_ks_register_users | map(attribute='role') | unique | list + service_ks_register_roles }}"
-  delegate_to: "{{ service_ks_register_delegate_host }}"
       register: service_ks_register_result
       until: service_ks_register_result is success
       retries: "{{ service_ks_register_retries }}"
       delay: "{{ service_ks_register_delay }}"
 
-- name: "{{ project_name }} | Granting user roles"
+    - name: "{{ project_name }} | Granting user roles"
-  become: true
       kolla_toolbox:
         module_name: "os_user_role"
         module_args:
@@ -126,9 +111,7 @@
           auth: "{{ service_ks_register_auth }}"
           interface: "{{ service_ks_register_interface }}"
           cacert: "{{ service_ks_cacert }}"
-  run_once: True
       with_items: "{{ service_ks_register_users + service_ks_register_user_roles }}"
-  delegate_to: "{{ service_ks_register_delegate_host }}"
       loop_control:
         label:
           user: "{{ item.user }}"
@@ -138,3 +121,6 @@
       until: service_ks_register_result is success
       retries: "{{ service_ks_register_retries }}"
       delay: "{{ service_ks_register_delay }}"
+
+  become: true
+  run_once: True