Merge "Fix deployment with public TLS enabled" into stable/ocata

ansible/group_vars/all.yml

@@ -275,6 +275,10 @@ openstack_auth:
     project_name: "admin"
     domain_name: "default"
 
+# Endpoint type used to connect with OpenStack services with ansible modules.
+# Valid options are [ public, internal, admin ]
+openstack_interface: "admin"
+
 # These roles are required for Kolla to be operation, however a savvy deployer
 # could disable some of these required roles and run their own services.
 enable_glance: "yes"

ansible/roles/aodh/tasks/register.yml

@@ -11,6 +11,7 @@
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_aodh_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_aodh_auth: "{{ openstack_aodh_auth }}"
   register: aodh_endpoint
@@ -33,6 +34,7 @@
       role: "admin"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_aodh_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_aodh_auth: "{{ openstack_aodh_auth }}"
   register: aodh_user

ansible/roles/barbican/tasks/register.yml

@@ -11,6 +11,7 @@
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_barbican_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_barbican_auth: "{{ openstack_barbican_auth }}"
   register: barbican_endpoint
@@ -33,6 +34,7 @@
       role: "admin"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_barbican_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_barbican_auth: "{{ openstack_barbican_auth }}"
   register: barbican_user
@@ -47,6 +49,7 @@
     module_args:
       name: "{{ item }}"
       auth: "{{ '{{ openstack_barbican_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_barbican_auth: "{{ openstack_barbican_auth }}"
   run_once: True

ansible/roles/ceilometer/tasks/register.yml

@@ -11,6 +11,7 @@
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_ceilometer_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_ceilometer_auth: "{{ openstack_ceilometer_auth }}"
   register: ceilometer_endpoint
@@ -33,6 +34,7 @@
       role: "admin"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_ceilometer_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
      openstack_ceilometer_auth: "{{ openstack_ceilometer_auth }}"
   register: ceilometer_user

ansible/roles/ceph/tasks/start_rgw_keystone.yml

@@ -2,6 +2,7 @@
 - name: Check whether the swift service is enabled
   local_action: fail msg='Ceph-rgw-keystone is conflicted with swift, you should only enable one of them'
   when: enable_swift | bool
+  run_once: True
 
 - name: Creating the Swift service and endpoint
   kolla_toolbox:
@@ -15,6 +16,7 @@
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_swift_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_swift_auth: "{{ openstack_swift_auth }}"
   run_once: True

ansible/roles/cinder/tasks/register.yml

@@ -11,6 +11,7 @@
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_cinder_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_cinder_auth: "{{ openstack_cinder_auth }}"
   register: cinder_endpoint
@@ -39,6 +40,7 @@
       role: "admin"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_cinder_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_cinder_auth: "{{ openstack_cinder_auth }}"
   register: cinder_user

ansible/roles/cloudkitty/tasks/register.yml

@@ -11,6 +11,7 @@
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_cloudkitty_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_cloudkitty_auth: "{{ openstack_cloudkitty_auth }}"
   register: cloudkitty_endpoint
@@ -33,6 +34,7 @@
       role: "admin"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_cloudkitty_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_cloudkitty_auth: "{{ openstack_cloudkitty_auth }}"
   register: cloudkitty_user
@@ -47,6 +49,7 @@
     module_args:
       name: "{{ cloudkitty_openstack_keystone_default_role }}"
       auth: "{{ '{{ openstack_cloudkitty_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_cloudkitty_auth: "{{ openstack_cloudkitty_auth }}"
   register: cloudkitty_role

ansible/roles/congress/tasks/register.yml

@@ -11,6 +11,7 @@
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_congress_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_congress_auth: "{{ openstack_congress_auth }}"
   register: congress_endpoint
@@ -33,6 +34,7 @@
       role: "admin"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_congress_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_congress_auth: "{{ openstack_congress_auth }}"
   register: congress_user

ansible/roles/designate/tasks/register.yml

@@ -11,6 +11,7 @@
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_designate_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_designate_auth: "{{ openstack_designate_auth }}"
   register: designate_endpoint
@@ -33,6 +34,7 @@
       role: "admin"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_designate_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_designate_auth: "{{ openstack_designate_auth }}"
   register: designate_user

ansible/roles/freezer/tasks/register.yml

@@ -11,6 +11,7 @@
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_freezer_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_freezer_auth: "{{ openstack_freezer_auth }}"
   register: freezer_endpoint
@@ -33,6 +34,7 @@
       role: admin
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_freezer_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_freezer_auth: "{{ openstack_freezer_auth }}"
   register: freezer_user

ansible/roles/glance/tasks/register.yml

@@ -11,6 +11,7 @@
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_glance_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_glance_auth: "{{ openstack_glance_auth }}"
   register: glance_endpoint
@@ -33,6 +34,7 @@
       role: "admin"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_glance_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_glance_auth: "{{ openstack_glance_auth }}"
   register: glance_user

ansible/roles/gnocchi/tasks/register.yml

@@ -11,6 +11,7 @@
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_gnocchi_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_gnocchi_auth: "{{ openstack_gnocchi_auth }}"
   register: gnocchi_endpoint
@@ -33,6 +34,7 @@
       role: "admin"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_gnocchi_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_gnocchi_auth: "{{ openstack_gnocchi_auth }}"
   register: gnocchi_user

ansible/roles/heat/tasks/register.yml

@@ -11,6 +11,7 @@
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_heat_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_heat_auth: "{{ openstack_heat_auth }}"
   register: heat_endpoint
@@ -36,6 +37,7 @@
       role: "admin"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_heat_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_heat_auth: "{{ openstack_heat_auth }}"
   register: heat_user
@@ -50,6 +52,7 @@
     module_args:
       name: "{{ heat_stack_user_role }}"
       auth: "{{ '{{ openstack_heat_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_heat_auth: "{{ openstack_heat_auth }}"
   register: heat_stack_user_role_result
@@ -64,6 +67,7 @@
     module_args:
       name: "{{ heat_stack_owner_role }}"
       auth: "{{ '{{ openstack_heat_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_heat_auth: "{{ openstack_heat_auth }}"
   register: heat_stack_owner_role_result
@@ -81,6 +85,7 @@
       role: "{{ heat_stack_owner_role }}"
       region_name: "{{ openstack_region_name }}"
       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

@@ -11,6 +11,7 @@
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_ironic_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_ironic_auth: "{{ openstack_ironic_auth }}"
   register: ironic_endpoint
@@ -34,6 +35,7 @@
       role: "admin"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_ironic_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_ironic_auth: "{{ openstack_ironic_auth }}"
   register: ironic_user
@@ -55,6 +57,7 @@
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_ironic_inspector_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_ironic_inspector_auth: "{{ openstack_ironic_inspector_auth }}"
   register: ironic_inspector_endpoint
@@ -78,6 +81,7 @@
       role: "admin"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_ironic_inspector_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_ironic_inspector_auth: "{{ openstack_ironic_inspector_auth }}"
   register: ironic_inspector_user

ansible/roles/karbor/tasks/register.yml

@@ -11,6 +11,7 @@
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_karbor_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_karbor_auth: "{{ openstack_karbor_auth }}"
   register: karbor_endpoint
@@ -33,6 +34,7 @@
       role: "admin"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_karbor_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_karbor_auth: "{{ openstack_karbor_auth }}"
   register: karbor_user

ansible/roles/keystone/tasks/register.yml

@@ -12,6 +12,7 @@
     module_args:
       name: "{{ keystone_default_user_role }}"
       auth: "{{ '{{ openstack_keystone_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_keystone_auth: "{{ openstack_keystone_auth }}"
   register: default_role

ansible/roles/kuryr/tasks/register.yml

@@ -9,6 +9,7 @@
       role: "admin"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_kuryr_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_kuryr_auth: "{{ openstack_kuryr_auth }}"
   register: kuryr_user

ansible/roles/magnum/tasks/register.yml

@@ -11,6 +11,7 @@
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_magnum_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_magnum_auth: "{{ openstack_magnum_auth }}"
   register: magnum_endpoint
@@ -33,6 +34,7 @@
       role: "admin"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_magnum_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_magnum_auth: "{{ openstack_magnum_auth }}"
   register: magnum_user
@@ -48,6 +50,7 @@
       name: "{{ magnum_trustee_domain }}"
       description: "Owns users and projects created by magnum"
       auth: "{{ '{{ openstack_magnum_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_magnum_auth: "{{ openstack_magnum_auth }}"
   register: trustee_domain
@@ -68,6 +71,7 @@
       domain: "{{ magnum_trustee_domain }}"
       password: "{{ magnum_keystone_password }}"
       auth: "{{ '{{ openstack_magnum_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_magnum_auth: "{{ openstack_magnum_auth }}"
   register: trustee_user
@@ -84,6 +88,7 @@
       user: "{{ magnum_trustee_domain_admin }}"
       role: "admin"
       auth: "{{ '{{ openstack_magnum_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_magnum_auth: "{{ openstack_magnum_auth }}"
   register: magnum_user_role_result

ansible/roles/manila/tasks/register.yml

@@ -11,6 +11,7 @@
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_manila_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_manila_auth: "{{ openstack_manila_auth }}"
   register: manila_endpoint
@@ -36,6 +37,7 @@
       role: "admin"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_manila_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_manila_auth: "{{ openstack_manila_auth }}"
   register: manila_user

ansible/roles/mistral/tasks/register.yml

@@ -11,6 +11,7 @@
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_mistral_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_mistral_auth: "{{ openstack_mistral_auth }}"
   register: mistral_endpoint
@@ -33,6 +34,7 @@
       role: "admin"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_mistral_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_mistral_auth: "{{ openstack_mistral_auth }}"
   register: mistral_user

ansible/roles/murano/tasks/register.yml

@@ -11,6 +11,7 @@
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_murano_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_murano_auth: "{{ openstack_murano_auth }}"
   register: murano_endpoint
@@ -33,6 +34,7 @@
       role: "admin"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_murano_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_murano_auth: "{{ openstack_murano_auth }}"
   register: murano_user

ansible/roles/neutron/tasks/register.yml

@@ -11,6 +11,7 @@
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_neutron_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_neutron_auth: "{{ openstack_neutron_auth }}"
   register: neutron_endpoint
@@ -33,6 +34,7 @@
       role: "admin"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_neutron_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_neutron_auth: "{{ openstack_neutron_auth }}"
   register: neutron_user

ansible/roles/nova/tasks/register.yml

@@ -11,6 +11,7 @@
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_nova_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_nova_auth: "{{ openstack_nova_auth }}"
   register: nova_endpoint
@@ -40,6 +41,7 @@
       role: "admin"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_nova_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_nova_auth: "{{ openstack_nova_auth }}"
   register: nova_user
@@ -58,6 +60,7 @@
       role: "admin"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_placement_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_placement_auth: "{{ openstack_placement_auth }}"
   register: placement_user

ansible/roles/octavia/tasks/register.yml

@@ -11,6 +11,7 @@
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_octavia_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_octavia_auth: "{{ openstack_octavia_auth }}"
   register: octavia_endpoint
@@ -33,6 +34,7 @@
       role: "admin"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_octavia_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_octavia_auth: "{{ openstack_octavia_auth }}"
   register: octavia_user

ansible/roles/panko/tasks/register.yml

@@ -11,6 +11,7 @@
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_panko_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_panko_auth: "{{ openstack_panko_auth }}"
   register: panko_endpoint
@@ -33,6 +34,7 @@
       role: "admin"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_panko_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_panko_auth: "{{ openstack_panko_auth }}"
   register: panko_user

ansible/roles/sahara/tasks/register.yml

@@ -11,6 +11,7 @@
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_sahara_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_sahara_auth: "{{ openstack_sahara_auth }}"
   register: sahara_endpoint
@@ -33,6 +34,7 @@
       role: "admin"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_sahara_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_sahara_auth: "{{ openstack_sahara_auth }}"
   register: sahara_user

ansible/roles/searchlight/tasks/register.yml

@@ -11,6 +11,7 @@
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_searchlight_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_searchlight_auth: "{{ openstack_searchlight_auth }}"
   register: searchlight_endpoint
@@ -33,6 +34,7 @@
       role: "admin"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_searchlight_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_searchlight_auth: "{{ openstack_searchlight_auth }}"
   register: searchlight_user

ansible/roles/senlin/tasks/register.yml

@@ -11,6 +11,7 @@
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_senlin_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_senlin_auth: "{{ openstack_senlin_auth }}"
   register: senlin_endpoint
@@ -33,6 +34,7 @@
       role: "admin"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_senlin_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_senlin_auth: "{{ openstack_senlin_auth }}"
   register: senlin_user

ansible/roles/solum/tasks/register.yml

@@ -11,6 +11,7 @@
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_solum_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_solum_auth: "{{ openstack_solum_auth }}"
   register: solum_image_builder_endpoint
@@ -35,6 +36,7 @@
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_solum_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_solum_auth: "{{ openstack_solum_auth }}"
   register: solum_application_deployment_endpoint
@@ -57,6 +59,7 @@
       role: "admin"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_solum_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_solum_auth: "{{ openstack_solum_auth }}"
   register: solum_user

ansible/roles/swift/tasks/register.yml

@@ -11,6 +11,7 @@
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_swift_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_swift_auth: "{{ openstack_swift_auth }}"
   register: swift_endpoint
@@ -33,6 +34,7 @@
       role: "{{ swift_admin_tenant_name }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_swift_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_swift_auth: "{{ openstack_swift_auth }}"
   register: swift_user

ansible/roles/tacker/tasks/register.yml

@@ -11,6 +11,7 @@
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_tacker_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_tacker_auth: "{{ openstack_tacker_auth }}"
   register: tacker_endpoint
@@ -33,6 +34,7 @@
       role: "admin"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_tacker_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_tacker_auth: "{{ openstack_tacker_auth }}"
   register: tacker_user

ansible/roles/trove/tasks/register.yml

@@ -11,6 +11,7 @@
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_trove_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_trove_auth: "{{ openstack_trove_auth }}"
   register: trove_endpoint
@@ -33,6 +34,7 @@
       role: "admin"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_trove_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_trove_auth: "{{ openstack_trove_auth }}"
   register: trove_user

ansible/roles/watcher/tasks/register.yml

@@ -11,6 +11,7 @@
       interface: "{{ item.interface }}"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_watcher_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_watcher_auth: "{{ openstack_watcher_auth }}"
   register: watcher_endpoint
@@ -33,6 +34,7 @@
       role: "admin"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_watcher_auth }}' }}"
+      endpoint_type: "{{ openstack_interface }}"
     module_extra_vars:
       openstack_watcher_auth: "{{ openstack_watcher_auth }}"
   register: watcher_user