Remove useless module_extra_vars in registry.yml

- remove uesless module_extra_vars, this is a historical issue. In the
  past, we use 'docker exec kolla_toolbox ansible xxx' to run module on
  target node, so complex data have to pass through extra_vars. Now we
  are using kolla_toolbox module, no need to use extra_vars anymore.
- Remove some useless until.

Change-Id: I72ed28001202917f9a82a1c3ea33cd6319911ec8

ansible/roles/aodh/tasks/register.yml

@@ -10,10 +10,8 @@
       url: "{{ item.url }}"
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_aodh_auth }}' }}"
+      auth: "{{ openstack_aodh_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_aodh_auth: "{{ openstack_aodh_auth }}"
   run_once: True
   with_items:
     - {'interface': 'admin', 'url': '{{ aodh_admin_endpoint }}'}
@@ -29,8 +27,6 @@
       password: "{{ aodh_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_aodh_auth }}' }}"
+      auth: "{{ openstack_aodh_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_aodh_auth: "{{ openstack_aodh_auth }}"
   run_once: True

ansible/roles/barbican/tasks/register.yml

@@ -10,10 +10,8 @@
       url: "{{ item.url }}"
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_barbican_auth }}' }}"
+      auth: "{{ openstack_barbican_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_barbican_auth: "{{ openstack_barbican_auth }}"
   run_once: True
   with_items:
     - {'interface': 'admin', 'url': '{{ barbican_admin_endpoint }}'}
@@ -29,10 +27,8 @@
       password: "{{ barbican_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_barbican_auth }}' }}"
+      auth: "{{ openstack_barbican_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_barbican_auth: "{{ openstack_barbican_auth }}"
   run_once: True
 
 - name: Creating default barbican roles
@@ -40,10 +36,8 @@
     module_name: os_keystone_role
     module_args:
       name: "{{ item }}"
-      auth: "{{ '{{ openstack_barbican_auth }}' }}"
+      auth: "{{ openstack_barbican_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_barbican_auth: "{{ openstack_barbican_auth }}"
   run_once: True
   with_items:
     - "{{ barbican_keymanager_role }}"

ansible/roles/blazar/tasks/register.yml

@@ -10,10 +10,8 @@
       url: "{{ item.url }}"
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_blazar_auth }}' }}"
+      auth: "{{ openstack_blazar_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_blazar_auth: "{{ openstack_blazar_auth }}"
   run_once: True
   with_items:
     - {'interface': 'admin', 'url': '{{ blazar_admin_endpoint }}'}
@@ -29,8 +27,6 @@
       password: "{{ blazar_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_blazar_auth }}' }}"
+      auth: "{{ openstack_blazar_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_blazar_auth: "{{ openstack_blazar_auth }}"
   run_once: True

ansible/roles/ceilometer/tasks/register.yml

@@ -8,10 +8,8 @@
       password: "{{ ceilometer_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_ceilometer_auth }}' }}"
+      auth: "{{ openstack_ceilometer_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_ceilometer_auth: "{{ openstack_ceilometer_auth }}"
   run_once: True
 
 - name: Associate the ResellerAdmin role and ceilometer user
@@ -22,9 +20,7 @@
       user: "{{ ceilometer_keystone_user }}"
       role: "ResellerAdmin"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_ceilometer_auth }}' }}"
+      auth: "{{ openstack_ceilometer_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_ceilometer_auth: "{{ openstack_ceilometer_auth }}"
   when: enable_swift | bool
   run_once: True

ansible/roles/ceph/tasks/start_rgw_keystone.yml

@@ -10,10 +10,8 @@
       url: "{{ item.url }}"
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_swift_auth }}' }}"
+      auth: "{{ openstack_swift_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_swift_auth: "{{ openstack_swift_auth }}"
   run_once: True
   with_items:
     - {'interface': 'admin', 'url': '{{ swift_admin_endpoint }}'}
@@ -29,8 +27,6 @@
       password: "{{ ceph_rgw_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_ceph_rgw_auth }}' }}"
+      auth: "{{ openstack_ceph_rgw_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_ceph_rgw_auth: "{{ openstack_swift_auth }}"
   run_once: True

ansible/roles/cinder/tasks/register.yml

@@ -10,10 +10,8 @@
       url: "{{ item.url }}"
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_cinder_auth }}' }}"
+      auth: "{{ openstack_cinder_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_cinder_auth: "{{ openstack_cinder_auth }}"
   run_once: True
   with_items:
     - {'interface': 'admin', 'url': '{{ cinder_admin_endpoint }}', 'service_name': 'cinder', 'service_type': 'volume'}
@@ -35,8 +33,6 @@
       password: "{{ cinder_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_cinder_auth }}' }}"
+      auth: "{{ openstack_cinder_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_cinder_auth: "{{ openstack_cinder_auth }}"
   run_once: True

ansible/roles/cloudkitty/tasks/register.yml

@@ -10,10 +10,8 @@
       url: "{{ item.url }}"
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_cloudkitty_auth }}' }}"
+      auth: "{{ openstack_cloudkitty_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_cloudkitty_auth: "{{ openstack_cloudkitty_auth }}"
   run_once: True
   with_items:
     - {'interface': 'admin', 'url': '{{ cloudkitty_admin_endpoint }}'}
@@ -29,10 +27,8 @@
       password: "{{ cloudkitty_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_cloudkitty_auth }}' }}"
+      auth: "{{ openstack_cloudkitty_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_cloudkitty_auth: "{{ openstack_cloudkitty_auth }}"
   run_once: True
 
 - name: Creating the rating role
@@ -40,8 +36,6 @@
     module_name: os_keystone_role
     module_args:
       name: "{{ cloudkitty_openstack_keystone_default_role }}"
-      auth: "{{ '{{ openstack_cloudkitty_auth }}' }}"
+      auth: "{{ openstack_cloudkitty_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_cloudkitty_auth: "{{ openstack_cloudkitty_auth }}"
   run_once: True

ansible/roles/congress/tasks/register.yml

@@ -10,10 +10,8 @@
       url: "{{ item.url }}"
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_congress_auth }}' }}"
+      auth: "{{ openstack_congress_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_congress_auth: "{{ openstack_congress_auth }}"
   run_once: True
   with_items:
     - {'interface': 'admin', 'url': '{{ congress_admin_endpoint }}'}
@@ -29,8 +27,6 @@
       password: "{{ congress_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_congress_auth }}' }}"
+      auth: "{{ openstack_congress_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_congress_auth: "{{ openstack_congress_auth }}"
   run_once: True

ansible/roles/designate/tasks/register.yml

@@ -10,10 +10,8 @@
       url: "{{ item.url }}"
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_designate_auth }}' }}"
+      auth: "{{ openstack_designate_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_designate_auth: "{{ openstack_designate_auth }}"
   run_once: True
   with_items:
     - {'interface': 'admin', 'url': '{{ designate_admin_endpoint }}'}
@@ -29,8 +27,6 @@
       password: "{{ designate_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_designate_auth }}' }}"
+      auth: "{{ openstack_designate_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_designate_auth: "{{ openstack_designate_auth }}"
   run_once: True

ansible/roles/freezer/tasks/register.yml

@@ -10,10 +10,8 @@
       url: "{{ item.url }}"
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_freezer_auth }}' }}"
+      auth: "{{ openstack_freezer_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_freezer_auth: "{{ openstack_freezer_auth }}"
   run_once: True
   with_items:
     - {'interface': 'admin', 'url': '{{ freezer_admin_endpoint }}'}
@@ -29,8 +27,6 @@
       password: "{{ freezer_keystone_password }}"
       role: admin
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_freezer_auth }}' }}"
+      auth: "{{ openstack_freezer_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_freezer_auth: "{{ openstack_freezer_auth }}"
   run_once: True

ansible/roles/glance/tasks/register.yml

@@ -10,10 +10,8 @@
       url: "{{ item.url }}"
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_glance_auth }}' }}"
+      auth: "{{ openstack_glance_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_glance_auth: "{{ openstack_glance_auth }}"
   run_once: True
   with_items:
     - {'interface': 'admin', 'url': '{{ glance_admin_endpoint }}'}
@@ -29,8 +27,6 @@
       password: "{{ glance_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_glance_auth }}' }}"
+      auth: "{{ openstack_glance_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_glance_auth: "{{ openstack_glance_auth }}"
   run_once: True

ansible/roles/gnocchi/tasks/register.yml

@@ -10,10 +10,8 @@
       url: "{{ item.url }}"
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_gnocchi_auth }}' }}"
+      auth: "{{ openstack_gnocchi_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_gnocchi_auth: "{{ openstack_gnocchi_auth }}"
   run_once: True
   with_items:
     - {'interface': 'admin', 'url': '{{ gnocchi_admin_endpoint }}'}
@@ -29,8 +27,6 @@
       password: "{{ gnocchi_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_gnocchi_auth }}' }}"
+      auth: "{{ openstack_gnocchi_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_gnocchi_auth: "{{ openstack_gnocchi_auth }}"
   run_once: True

ansible/roles/heat/tasks/register.yml

@@ -10,10 +10,8 @@
       url: "{{ item.url }}"
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_heat_auth }}' }}"
+      auth: "{{ openstack_heat_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_heat_auth: "{{ openstack_heat_auth }}"
   run_once: True
   with_items:
     - {'interface': 'admin', 'url': '{{ heat_admin_endpoint }}', 'service_name': 'heat', 'service_type': 'orchestration', 'description': 'OpenStack Orchestration'}
@@ -32,10 +30,8 @@
       password: "{{ heat_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_heat_auth }}' }}"
+      auth: "{{ openstack_heat_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_heat_auth: "{{ openstack_heat_auth }}"
   run_once: True
 
 - name: Creating the heat_stack_user role
@@ -43,10 +39,8 @@
     module_name: os_keystone_role
     module_args:
       name: "{{ heat_stack_user_role }}"
-      auth: "{{ '{{ openstack_heat_auth }}' }}"
+      auth: "{{ openstack_heat_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_heat_auth: "{{ openstack_heat_auth }}"
   run_once: True
 
 - name: Creating the heat_stack_owner role
@@ -54,10 +48,8 @@
     module_name: os_keystone_role
     module_args:
       name: "{{ heat_stack_owner_role }}"
-      auth: "{{ '{{ openstack_heat_auth }}' }}"
+      auth: "{{ openstack_heat_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_heat_auth: "{{ openstack_heat_auth }}"
   run_once: True
 
 - name: Add the heat_stack_owner role to the admin project
@@ -68,8 +60,6 @@
       user: "{{ openstack_auth.username }}"
       role: "{{ heat_stack_owner_role }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_heat_auth }}' }}"
+      auth: "{{ openstack_heat_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_heat_auth: "{{ openstack_heat_auth }}"
   run_once: True

ansible/roles/ironic/tasks/register.yml

@@ -10,10 +10,8 @@
       url: "{{ item.url }}"
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_ironic_auth }}' }}"
+      auth: "{{ openstack_ironic_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_ironic_auth: "{{ openstack_ironic_auth }}"
   run_once: True
   when: inventory_hostname in groups['ironic-api']
   with_items:
@@ -30,10 +28,8 @@
       password: "{{ ironic_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_ironic_auth }}' }}"
+      auth: "{{ openstack_ironic_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_ironic_auth: "{{ openstack_ironic_auth }}"
   run_once: True
   when: inventory_hostname in groups['ironic-api']
 
@@ -48,10 +44,8 @@
       url: "{{ item.url }}"
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_ironic_inspector_auth }}' }}"
+      auth: "{{ openstack_ironic_inspector_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_ironic_inspector_auth: "{{ openstack_ironic_inspector_auth }}"
   run_once: True
   when: inventory_hostname in groups['ironic-inspector']
   with_items:
@@ -68,9 +62,7 @@
       password: "{{ ironic_inspector_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_ironic_inspector_auth }}' }}"
+      auth: "{{ openstack_ironic_inspector_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_ironic_inspector_auth: "{{ openstack_ironic_inspector_auth }}"
   run_once: True
   when: inventory_hostname in groups['ironic-inspector']

ansible/roles/karbor/tasks/register.yml

@@ -10,10 +10,8 @@
       url: "{{ item.url }}"
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_karbor_auth }}' }}"
+      auth: "{{ openstack_karbor_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_karbor_auth: "{{ openstack_karbor_auth }}"
   run_once: True
   with_items:
     - {'interface': 'admin', 'url': '{{ karbor_admin_endpoint }}'}
@@ -29,8 +27,6 @@
       password: "{{ karbor_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_karbor_auth }}' }}"
+      auth: "{{ openstack_karbor_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_karbor_auth: "{{ openstack_karbor_auth }}"
   run_once: True

ansible/roles/keystone/tasks/register.yml

@@ -12,12 +12,6 @@
     module_name: "os_keystone_role"
     module_args:
       name: "{{ keystone_default_user_role }}"
-      auth: "{{ '{{ openstack_keystone_auth }}' }}"
+      auth: "{{ openstack_keystone_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_keystone_auth: "{{ openstack_keystone_auth }}"
-  register: default_role
-  until: default_role|success
-  retries: 10
-  delay: 5
   run_once: True

ansible/roles/kuryr/tasks/register.yml

@@ -8,8 +8,6 @@
       password: "{{ kuryr_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_kuryr_auth }}' }}"
+      auth: "{{ openstack_kuryr_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_kuryr_auth: "{{ openstack_kuryr_auth }}"
   run_once: True

ansible/roles/magnum/tasks/register.yml

@@ -10,10 +10,8 @@
       url: "{{ item.url }}"
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_magnum_auth }}' }}"
+      auth: "{{ openstack_magnum_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_magnum_auth: "{{ openstack_magnum_auth }}"
   run_once: True
   with_items:
     - {'interface': 'admin', 'url': '{{ magnum_admin_endpoint }}'}
@@ -29,10 +27,8 @@
       password: "{{ magnum_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_magnum_auth }}' }}"
+      auth: "{{ openstack_magnum_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_magnum_auth: "{{ openstack_magnum_auth }}"
   run_once: True
 
 - name: Creating Magnum trustee domain
@@ -41,11 +37,8 @@
     module_args:
       name: "{{ magnum_trustee_domain }}"
       description: "Owns users and projects created by magnum"
-      auth: "{{ '{{ openstack_magnum_auth }}' }}"
+      auth: "{{ openstack_magnum_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_magnum_auth: "{{ openstack_magnum_auth }}"
-  register: trustee_domain
   run_once: True
 
 - name: Creating Magnum trustee user
@@ -55,10 +48,8 @@
       name: "{{ magnum_trustee_domain_admin }}"
       domain: "{{ magnum_trustee_domain }}"
       password: "{{ magnum_keystone_password }}"
-      auth: "{{ '{{ openstack_magnum_auth }}' }}"
+      auth: "{{ openstack_magnum_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_magnum_auth: "{{ openstack_magnum_auth }}"
   run_once: True
 
 - name: Creating Magnum trustee user role
@@ -68,8 +59,6 @@
       domain: "{{ trustee_domain.id }}"
       user: "{{ magnum_trustee_domain_admin }}"
       role: "admin"
-      auth: "{{ '{{ openstack_magnum_auth }}' }}"
+      auth: "{{ openstack_magnum_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_magnum_auth: "{{ openstack_magnum_auth }}"
   run_once: True

ansible/roles/manila/tasks/register.yml

@@ -10,10 +10,8 @@
       url: "{{ item.url }}"
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_manila_auth }}' }}"
+      auth: "{{ openstack_manila_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_manila_auth: "{{ openstack_manila_auth }}"
   run_once: True
   with_items:
     - {'interface': 'admin', 'url': '{{ manila_admin_endpoint }}', 'service_name': 'manila', 'service_type': 'share'}
@@ -34,6 +32,4 @@
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_manila_auth }}' }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_manila_auth: "{{ openstack_manila_auth }}"
   run_once: True

ansible/roles/mistral/tasks/register.yml

@@ -10,10 +10,8 @@
       url: "{{ item.url }}"
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_mistral_auth }}' }}"
+      auth: "{{ openstack_mistral_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_mistral_auth: "{{ openstack_mistral_auth }}"
   run_once: True
   with_items:
     - {'interface': 'admin', 'url': '{{ mistral_admin_endpoint }}'}
@@ -29,8 +27,6 @@
       password: "{{ mistral_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_mistral_auth }}' }}"
+      auth: "{{ openstack_mistral_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_mistral_auth: "{{ openstack_mistral_auth }}"
   run_once: True

ansible/roles/murano/tasks/register.yml

@@ -10,10 +10,8 @@
       url: "{{ item.url }}"
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_murano_auth }}' }}"
+      auth: "{{ openstack_murano_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_murano_auth: "{{ openstack_murano_auth }}"
   run_once: True
   with_items:
     - {'interface': 'admin', 'url': '{{ murano_admin_endpoint }}'}
@@ -29,8 +27,6 @@
       password: "{{ murano_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_murano_auth }}' }}"
+      auth: "{{ openstack_murano_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_murano_auth: "{{ openstack_murano_auth }}"
   run_once: True

ansible/roles/neutron/tasks/register.yml

@@ -10,10 +10,8 @@
       url: "{{ item.url }}"
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_neutron_auth }}' }}"
+      auth: "{{ openstack_neutron_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_neutron_auth: "{{ openstack_neutron_auth }}"
   run_once: True
   with_items:
     - {'interface': 'admin', 'url': '{{ neutron_admin_endpoint }}'}
@@ -29,8 +27,6 @@
       password: "{{ neutron_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_neutron_auth }}' }}"
+      auth: "{{ openstack_neutron_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_neutron_auth: "{{ openstack_neutron_auth }}"
   run_once: True

ansible/roles/nova/tasks/register.yml

@@ -10,10 +10,8 @@
       url: "{{ item.url }}"
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_nova_auth }}' }}"
+      auth: "{{ openstack_nova_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_nova_auth: "{{ openstack_nova_auth }}"
   run_once: True
   with_items:
     - {'name': 'nova_legacy', 'service_type': 'compute_legacy', 'interface': 'admin', 'url': '{{ nova_legacy_admin_endpoint }}', 'description': 'OpenStack Compute Service (Legacy 2.0)'}
@@ -36,10 +34,8 @@
       password: "{{ nova_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_nova_auth }}' }}"
+      auth: "{{ openstack_nova_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_nova_auth: "{{ openstack_nova_auth }}"
   run_once: True
 
 - name: Creating the placement project, user, and role
@@ -51,12 +47,6 @@
       password: "{{ placement_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_placement_auth }}' }}"
+      auth: "{{ openstack_placement_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_placement_auth: "{{ openstack_placement_auth }}"
-  register: placement_user
-  until: placement_user|success
-  retries: 10
-  delay: 5
   run_once: True

ansible/roles/octavia/tasks/register.yml

@@ -10,10 +10,8 @@
       url: "{{ item.url }}"
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_octavia_auth }}' }}"
+      auth: "{{ openstack_octavia_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_octavia_auth: "{{ openstack_octavia_auth }}"
   run_once: True
   with_items:
     - {'interface': 'admin', 'url': '{{ octavia_admin_endpoint }}'}
@@ -29,10 +27,8 @@
       password: "{{ octavia_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_octavia_auth }}' }}"
+      auth: "{{ openstack_octavia_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_octavia_auth: "{{ openstack_octavia_auth }}"
   run_once: True
 
 - name: Adding octavia user into admin project
@@ -42,10 +38,8 @@
       user: "{{ octavia_keystone_user }}"
       role: admin
       project: admin
-      auth: "{{ '{{ openstack_octavia_auth }}' }}"
+      auth: "{{ openstack_octavia_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_octavia_auth: "{{ openstack_octavia_auth }}"
   run_once: True
 
 - name: Adding octavia related roles
@@ -53,9 +47,7 @@
     module_name: "os_keystone_role"
     module_args:
       name: "{{ item }}"
-      auth: "{{ '{{ openstack_octavia_auth }}' }}"
+      auth: "{{ openstack_octavia_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_octavia_auth: "{{ openstack_octavia_auth }}"
   run_once: True
   with_items: "{{ octavia_required_roles }}"

ansible/roles/panko/tasks/register.yml

@@ -10,10 +10,8 @@
       url: "{{ item.url }}"
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_panko_auth }}' }}"
+      auth: "{{ openstack_panko_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_panko_auth: "{{ openstack_panko_auth }}"
   run_once: True
   with_items:
     - {'interface': 'admin', 'url': '{{ panko_admin_endpoint }}'}
@@ -31,6 +29,4 @@
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_panko_auth }}' }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_panko_auth: "{{ openstack_panko_auth }}"
   run_once: True

ansible/roles/sahara/tasks/register.yml

@@ -10,10 +10,8 @@
       url: "{{ item.url }}"
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_sahara_auth }}' }}"
+      auth: "{{ openstack_sahara_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_sahara_auth: "{{ openstack_sahara_auth }}"
   run_once: True
   with_items:
     - {'interface': 'admin', 'url': '{{ sahara_admin_endpoint }}'}
@@ -31,6 +29,4 @@
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_sahara_auth }}' }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_sahara_auth: "{{ openstack_sahara_auth }}"
   run_once: True

ansible/roles/searchlight/tasks/register.yml

@@ -10,10 +10,8 @@
       url: "{{ item.url }}"
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_searchlight_auth }}' }}"
+      auth: "{{ openstack_searchlight_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_searchlight_auth: "{{ openstack_searchlight_auth }}"
   run_once: True
   with_items:
     - {'interface': 'admin', 'url': '{{ searchlight_admin_endpoint }}'}
@@ -29,8 +27,6 @@
       password: "{{ searchlight_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_searchlight_auth }}' }}"
+      auth: "{{ openstack_searchlight_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_searchlight_auth: "{{ openstack_searchlight_auth }}"
   run_once: True

ansible/roles/senlin/tasks/register.yml

@@ -10,10 +10,8 @@
       url: "{{ item.url }}"
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_senlin_auth }}' }}"
+      auth: "{{ openstack_senlin_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_senlin_auth: "{{ openstack_senlin_auth }}"
   run_once: True
   with_items:
     - {'interface': 'admin', 'url': '{{ senlin_admin_endpoint }}'}
@@ -29,8 +27,6 @@
       password: "{{ senlin_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_senlin_auth }}' }}"
+      auth: "{{ openstack_senlin_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_senlin_auth: "{{ openstack_senlin_auth }}"
   run_once: True

ansible/roles/solum/tasks/register.yml

@@ -10,10 +10,8 @@
       url: "{{ item.url }}"
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_solum_auth }}' }}"
+      auth: "{{ openstack_solum_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_solum_auth: "{{ openstack_solum_auth }}"
   run_once: True
   with_items:
     - {'interface': 'admin', 'url': '{{ solum_image_builder_admin_endpoint }}'}
@@ -31,10 +29,8 @@
       url: "{{ item.url }}"
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_solum_auth }}' }}"
+      auth: "{{ openstack_solum_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_solum_auth: "{{ openstack_solum_auth }}"
   run_once: True
   with_items:
     - {'interface': 'admin', 'url': '{{ solum_application_deployment_admin_endpoint }}'}
@@ -50,8 +46,6 @@
       password: "{{ solum_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_solum_auth }}' }}"
+      auth: "{{ openstack_solum_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_solum_auth: "{{ openstack_solum_auth }}"
   run_once: True

ansible/roles/swift/tasks/register.yml

@@ -10,10 +10,8 @@
       url: "{{ item.url }}"
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_swift_auth }}' }}"
+      auth: "{{ openstack_swift_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_swift_auth: "{{ openstack_swift_auth }}"
   run_once: True
   with_items:
     - {'interface': 'admin', 'url': '{{ swift_admin_endpoint }}'}
@@ -29,10 +27,8 @@
       password: "{{ swift_keystone_password }}"
       role: "{{ swift_admin_tenant_name }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_swift_auth }}' }}"
+      auth: "{{ openstack_swift_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_swift_auth: "{{ openstack_swift_auth }}"
   run_once: True
 
 - name: Creating the ResellerAdmin role
@@ -41,8 +37,6 @@
     module_args:
       name: "ResellerAdmin"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_swift_auth }}' }}"
+      auth: "{{ openstack_swift_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_swift_auth: "{{ openstack_swift_auth }}"
   run_once: True

ansible/roles/tacker/tasks/register.yml

@@ -10,10 +10,8 @@
       url: "{{ item.url }}"
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_tacker_auth }}' }}"
+      auth: "{{ openstack_tacker_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_tacker_auth: "{{ openstack_tacker_auth }}"
   run_once: True
   with_items:
     - {'interface': 'admin', 'url': '{{ tacker_admin_endpoint }}'}
@@ -29,8 +27,6 @@
       password: "{{ tacker_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_tacker_auth }}' }}"
+      auth: "{{ openstack_tacker_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_tacker_auth: "{{ openstack_tacker_auth }}"
   run_once: True

ansible/roles/trove/tasks/register.yml

@@ -10,10 +10,8 @@
       url: "{{ item.url }}"
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_trove_auth }}' }}"
+      auth: "{{ openstack_trove_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_trove_auth: "{{ openstack_trove_auth }}"
   run_once: True
   with_items:
     - {'interface': 'admin', 'url': '{{ trove_admin_endpoint }}'}
@@ -29,8 +27,6 @@
       password: "{{ trove_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_trove_auth }}' }}"
+      auth: "{{ openstack_trove_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_trove_auth: "{{ openstack_trove_auth }}"
   run_once: True

ansible/roles/vitrage/tasks/register.yml

@@ -10,13 +10,7 @@
       url: "{{ item.url }}"
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_vitrage_auth }}' }}"
+      auth: "{{ openstack_vitrage_auth }}"
-    module_extra_vars:
-      openstack_vitrage_auth: "{{ openstack_vitrage_auth }}"
-  register: vitrage_endpoint
-  until: vitrage_endpoint|success
-  retries: 10
-  delay: 5
   run_once: True
   with_items:
     - {'interface': 'admin', 'url': '{{ vitrage_admin_endpoint }}'}
@@ -32,11 +26,5 @@
       password: "{{ vitrage_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_vitrage_auth }}' }}"
+      auth: "{{ openstack_vitrage_auth }}"
-    module_extra_vars:
-      openstack_vitrage_auth: "{{ openstack_vitrage_auth }}"
-  register: vitrage_user
-  until: vitrage_user|success
-  retries: 10
-  delay: 5
   run_once: True

ansible/roles/watcher/tasks/register.yml

@@ -10,10 +10,8 @@
       url: "{{ item.url }}"
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_watcher_auth }}' }}"
+      auth: "{{ openstack_watcher_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_watcher_auth: "{{ openstack_watcher_auth }}"
   run_once: True
   with_items:
     - {'interface': 'admin', 'url': '{{ watcher_admin_endpoint }}'}
@@ -29,8 +27,6 @@
       password: "{{ watcher_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_watcher_auth }}' }}"
+      auth: "{{ openstack_watcher_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_watcher_auth: "{{ openstack_watcher_auth }}"
   run_once: True

ansible/roles/zun/tasks/register.yml

@@ -10,10 +10,8 @@
       url: "{{ item.url }}"
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_zun_auth }}' }}"
+      auth: "{{ openstack_zun_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_zun_auth: "{{ openstack_zun_auth }}"
   run_once: True
   with_items:
     - {'interface': 'admin', 'url': '{{ zun_admin_endpoint }}'}
@@ -29,8 +27,6 @@
       password: "{{ zun_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"
-      auth: "{{ '{{ openstack_zun_auth }}' }}"
+      auth: "{{ openstack_zun_auth }}"
       endpoint_type: "{{ openstack_interface }}"
-    module_extra_vars:
-      openstack_zun_auth: "{{ openstack_zun_auth }}"
   run_once: True