From 9e48668d6ba452928b5aceec133268655b629f76 Mon Sep 17 00:00:00 2001 From: Eduardo Gonzalez Date: Tue, 3 Oct 2017 14:48:55 +0200 Subject: [PATCH] Fix deployment with public TLS enabled When deploying with tls enabled in public endpoints, ansible modules fails due SSL certificates are self-signed. This change adds a new variable to allow customization on which endpoints ansible should connect. Defaults to admin because admin auth parameters defaults to admin endpoint. Change-Id: Ic3ed58cf9c9579cae08a11bbfe6fce983b5a9cbc Closes-Bug: #1720995 (cherry picked from commit 56374206bebe1a4a3f25e2099cbd839f47ff3a6f) (cherry picked from commit ec8e233f4d4523eee7f777421ac35904151300f2) --- ansible/group_vars/all.yml | 4 ++++ ansible/roles/aodh/tasks/register.yml | 2 ++ ansible/roles/barbican/tasks/register.yml | 3 +++ ansible/roles/ceilometer/tasks/register.yml | 2 ++ ansible/roles/ceph/tasks/start_rgw_keystone.yml | 2 ++ ansible/roles/cinder/tasks/register.yml | 2 ++ ansible/roles/cloudkitty/tasks/register.yml | 3 +++ ansible/roles/congress/tasks/register.yml | 2 ++ ansible/roles/designate/tasks/register.yml | 2 ++ ansible/roles/freezer/tasks/register.yml | 2 ++ ansible/roles/glance/tasks/register.yml | 2 ++ ansible/roles/gnocchi/tasks/register.yml | 2 ++ ansible/roles/heat/tasks/register.yml | 5 +++++ ansible/roles/ironic/tasks/register.yml | 4 ++++ ansible/roles/karbor/tasks/register.yml | 2 ++ ansible/roles/keystone/tasks/register.yml | 1 + ansible/roles/kuryr/tasks/register.yml | 1 + ansible/roles/magnum/tasks/register.yml | 5 +++++ ansible/roles/manila/tasks/register.yml | 2 ++ ansible/roles/mistral/tasks/register.yml | 2 ++ ansible/roles/murano/tasks/register.yml | 2 ++ ansible/roles/neutron/tasks/register.yml | 2 ++ ansible/roles/nova/tasks/register.yml | 3 +++ ansible/roles/octavia/tasks/register.yml | 2 ++ ansible/roles/panko/tasks/register.yml | 2 ++ ansible/roles/sahara/tasks/register.yml | 2 ++ ansible/roles/searchlight/tasks/register.yml | 2 ++ ansible/roles/senlin/tasks/register.yml | 2 ++ ansible/roles/solum/tasks/register.yml | 3 +++ ansible/roles/swift/tasks/register.yml | 2 ++ ansible/roles/tacker/tasks/register.yml | 2 ++ ansible/roles/trove/tasks/register.yml | 2 ++ ansible/roles/watcher/tasks/register.yml | 2 ++ 33 files changed, 78 insertions(+) diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index ba862a27eb..c3ad71c0af 100644 --- a/ansible/group_vars/all.yml +++ b/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" diff --git a/ansible/roles/aodh/tasks/register.yml b/ansible/roles/aodh/tasks/register.yml index 3ffc95c578..f9f0efdd9e 100644 --- a/ansible/roles/aodh/tasks/register.yml +++ b/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 diff --git a/ansible/roles/barbican/tasks/register.yml b/ansible/roles/barbican/tasks/register.yml index dab2fd11dc..2bd96834ca 100644 --- a/ansible/roles/barbican/tasks/register.yml +++ b/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 diff --git a/ansible/roles/ceilometer/tasks/register.yml b/ansible/roles/ceilometer/tasks/register.yml index 87ba09d075..1f89e3e6bf 100644 --- a/ansible/roles/ceilometer/tasks/register.yml +++ b/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 diff --git a/ansible/roles/ceph/tasks/start_rgw_keystone.yml b/ansible/roles/ceph/tasks/start_rgw_keystone.yml index 5409644a19..ef6b1aef6d 100644 --- a/ansible/roles/ceph/tasks/start_rgw_keystone.yml +++ b/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 diff --git a/ansible/roles/cinder/tasks/register.yml b/ansible/roles/cinder/tasks/register.yml index 3357fa353f..667a3a2339 100644 --- a/ansible/roles/cinder/tasks/register.yml +++ b/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 diff --git a/ansible/roles/cloudkitty/tasks/register.yml b/ansible/roles/cloudkitty/tasks/register.yml index f7f340bdba..981928e7d7 100644 --- a/ansible/roles/cloudkitty/tasks/register.yml +++ b/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 diff --git a/ansible/roles/congress/tasks/register.yml b/ansible/roles/congress/tasks/register.yml index 8034e6044d..1eee774769 100644 --- a/ansible/roles/congress/tasks/register.yml +++ b/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 diff --git a/ansible/roles/designate/tasks/register.yml b/ansible/roles/designate/tasks/register.yml index 297c5ce539..e6390b9861 100644 --- a/ansible/roles/designate/tasks/register.yml +++ b/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 diff --git a/ansible/roles/freezer/tasks/register.yml b/ansible/roles/freezer/tasks/register.yml index 3216c974d4..0a61315cc1 100644 --- a/ansible/roles/freezer/tasks/register.yml +++ b/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 diff --git a/ansible/roles/glance/tasks/register.yml b/ansible/roles/glance/tasks/register.yml index 4d05145814..c1858f58a4 100644 --- a/ansible/roles/glance/tasks/register.yml +++ b/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 diff --git a/ansible/roles/gnocchi/tasks/register.yml b/ansible/roles/gnocchi/tasks/register.yml index a50f3a4d5d..042d4141c4 100644 --- a/ansible/roles/gnocchi/tasks/register.yml +++ b/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 diff --git a/ansible/roles/heat/tasks/register.yml b/ansible/roles/heat/tasks/register.yml index 0b4c3e38cf..37b2a063c0 100644 --- a/ansible/roles/heat/tasks/register.yml +++ b/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 diff --git a/ansible/roles/ironic/tasks/register.yml b/ansible/roles/ironic/tasks/register.yml index dee5577511..a6be17c3ec 100644 --- a/ansible/roles/ironic/tasks/register.yml +++ b/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 diff --git a/ansible/roles/karbor/tasks/register.yml b/ansible/roles/karbor/tasks/register.yml index 9c6f22e020..82d937ada4 100644 --- a/ansible/roles/karbor/tasks/register.yml +++ b/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 diff --git a/ansible/roles/keystone/tasks/register.yml b/ansible/roles/keystone/tasks/register.yml index a322334adf..f89f3b1440 100644 --- a/ansible/roles/keystone/tasks/register.yml +++ b/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 diff --git a/ansible/roles/kuryr/tasks/register.yml b/ansible/roles/kuryr/tasks/register.yml index da5136ad6a..b7ece29aa8 100644 --- a/ansible/roles/kuryr/tasks/register.yml +++ b/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 diff --git a/ansible/roles/magnum/tasks/register.yml b/ansible/roles/magnum/tasks/register.yml index dee7a41753..9a24d22461 100644 --- a/ansible/roles/magnum/tasks/register.yml +++ b/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 diff --git a/ansible/roles/manila/tasks/register.yml b/ansible/roles/manila/tasks/register.yml index 7c109819f6..b0c3cd61e3 100644 --- a/ansible/roles/manila/tasks/register.yml +++ b/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 diff --git a/ansible/roles/mistral/tasks/register.yml b/ansible/roles/mistral/tasks/register.yml index 0ae6911c96..1fe62bf1fa 100644 --- a/ansible/roles/mistral/tasks/register.yml +++ b/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 diff --git a/ansible/roles/murano/tasks/register.yml b/ansible/roles/murano/tasks/register.yml index cd3c028b7e..3d78a768d7 100644 --- a/ansible/roles/murano/tasks/register.yml +++ b/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 diff --git a/ansible/roles/neutron/tasks/register.yml b/ansible/roles/neutron/tasks/register.yml index 9903b7c6f4..4b6dfaa302 100644 --- a/ansible/roles/neutron/tasks/register.yml +++ b/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 diff --git a/ansible/roles/nova/tasks/register.yml b/ansible/roles/nova/tasks/register.yml index ff61bc1df9..8df8cb6664 100644 --- a/ansible/roles/nova/tasks/register.yml +++ b/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 diff --git a/ansible/roles/octavia/tasks/register.yml b/ansible/roles/octavia/tasks/register.yml index d7f53d4f2c..c6372f94ba 100644 --- a/ansible/roles/octavia/tasks/register.yml +++ b/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 diff --git a/ansible/roles/panko/tasks/register.yml b/ansible/roles/panko/tasks/register.yml index 96956d13ed..94a4b2f3e6 100644 --- a/ansible/roles/panko/tasks/register.yml +++ b/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 diff --git a/ansible/roles/sahara/tasks/register.yml b/ansible/roles/sahara/tasks/register.yml index cdb80bc8a2..cc86ad0228 100644 --- a/ansible/roles/sahara/tasks/register.yml +++ b/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 diff --git a/ansible/roles/searchlight/tasks/register.yml b/ansible/roles/searchlight/tasks/register.yml index bd656ab92a..fe032efcdf 100644 --- a/ansible/roles/searchlight/tasks/register.yml +++ b/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 diff --git a/ansible/roles/senlin/tasks/register.yml b/ansible/roles/senlin/tasks/register.yml index f308727c1a..8e8d7a71c6 100644 --- a/ansible/roles/senlin/tasks/register.yml +++ b/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 diff --git a/ansible/roles/solum/tasks/register.yml b/ansible/roles/solum/tasks/register.yml index 1f7ab49bd7..8b245e2aa1 100644 --- a/ansible/roles/solum/tasks/register.yml +++ b/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 diff --git a/ansible/roles/swift/tasks/register.yml b/ansible/roles/swift/tasks/register.yml index ad1edc8be7..4ff31c1f45 100644 --- a/ansible/roles/swift/tasks/register.yml +++ b/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 diff --git a/ansible/roles/tacker/tasks/register.yml b/ansible/roles/tacker/tasks/register.yml index bf11ef5536..cb4d6531f5 100644 --- a/ansible/roles/tacker/tasks/register.yml +++ b/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 diff --git a/ansible/roles/trove/tasks/register.yml b/ansible/roles/trove/tasks/register.yml index 635adb5d86..4ed9ee1cc9 100644 --- a/ansible/roles/trove/tasks/register.yml +++ b/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 diff --git a/ansible/roles/watcher/tasks/register.yml b/ansible/roles/watcher/tasks/register.yml index 85f5ad7157..4d5f016616 100644 --- a/ansible/roles/watcher/tasks/register.yml +++ b/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