diff --git a/ansible/roles/aodh/templates/aodh.conf.j2 b/ansible/roles/aodh/templates/aodh.conf.j2 index b9c3b08475d1a3b19b1401c277f5137681101e1f..607c19e17e3920aa6ccd71f6b0fa9e4d20dbadb1 100644 --- a/ansible/roles/aodh/templates/aodh.conf.j2 +++ b/ansible/roles/aodh/templates/aodh.conf.j2 @@ -28,6 +28,7 @@ password = {{ aodh_keystone_password }} auth_url = {{ keystone_admin_url }} auth_type = password cafile = {{ openstack_cacert }} +region_name = {{ openstack_region_name }} [oslo_middleware] enable_proxy_headers_parsing = True diff --git a/ansible/roles/barbican/templates/barbican.conf.j2 b/ansible/roles/barbican/templates/barbican.conf.j2 index 62412b21ef89f057c9128d106a0f42195017e1e8..dd285796e517939ef13f2b95c349e5e0c914ca4c 100644 --- a/ansible/roles/barbican/templates/barbican.conf.j2 +++ b/ansible/roles/barbican/templates/barbican.conf.j2 @@ -64,6 +64,7 @@ password = {{ barbican_keystone_password }} auth_url = {{ keystone_admin_url }} auth_type = password cafile = {{ openstack_cacert }} +region_name = {{ openstack_region_name }} memcache_security_strategy = ENCRYPT memcache_secret_key = {{ memcache_secret_key }} diff --git a/ansible/roles/blazar/templates/blazar.conf.j2 b/ansible/roles/blazar/templates/blazar.conf.j2 index bfce292e3bdcc1c6f271c22f3f76fcdfd7ba9d62..ae7a8710fada878591bc7854284876ab7cf97ddc 100644 --- a/ansible/roles/blazar/templates/blazar.conf.j2 +++ b/ansible/roles/blazar/templates/blazar.conf.j2 @@ -30,6 +30,7 @@ username = {{ blazar_keystone_user }} password = {{ blazar_keystone_password }} service_token_roles_required = True cafile = {{ openstack_cacert }} +region_name = {{ openstack_region_name }} memcache_security_strategy = ENCRYPT memcache_secret_key = {{ memcache_secret_key }} diff --git a/ansible/roles/cinder/templates/cinder.conf.j2 b/ansible/roles/cinder/templates/cinder.conf.j2 index 6e838077e037bf8efbba3a0b136dec2ed8c1539c..c4d99c6adc8fd26aaca892d284af473a60b77c4f 100644 --- a/ansible/roles/cinder/templates/cinder.conf.j2 +++ b/ansible/roles/cinder/templates/cinder.conf.j2 @@ -114,6 +114,7 @@ project_name = service username = {{ cinder_keystone_user }} password = {{ cinder_keystone_password }} cafile = {{ openstack_cacert }} +region_name = {{ openstack_region_name }} memcache_security_strategy = ENCRYPT memcache_secret_key = {{ memcache_secret_key }} diff --git a/ansible/roles/cyborg/templates/cyborg.conf.j2 b/ansible/roles/cyborg/templates/cyborg.conf.j2 index 0b00cc4cc8cd14c58082794555fc16d567002253..ff4a2f7ca0003dfcb5296581f64409037fdb0a3d 100644 --- a/ansible/roles/cyborg/templates/cyborg.conf.j2 +++ b/ansible/roles/cyborg/templates/cyborg.conf.j2 @@ -27,6 +27,7 @@ password = {{ cyborg_keystone_password }} auth_url = {{ keystone_admin_url }} auth_type = password cafile = {{ openstack_cacert }} +region_name = {{ openstack_region_name }} [placement] auth_type = password diff --git a/ansible/roles/designate/templates/designate.conf.j2 b/ansible/roles/designate/templates/designate.conf.j2 index 67101ef742823f7fd4391669f77e0500d47e2553..faf14ac7ebe0d2dd321f03ef91509e7b058594b7 100644 --- a/ansible/roles/designate/templates/designate.conf.j2 +++ b/ansible/roles/designate/templates/designate.conf.j2 @@ -30,6 +30,7 @@ password = {{ designate_keystone_password }} http_connect_timeout = 60 service_token_roles_required = True cafile = {{ openstack_cacert }} +region_name = {{ openstack_region_name }} memcache_security_strategy = ENCRYPT memcache_secret_key = {{ memcache_secret_key }} diff --git a/ansible/roles/freezer/templates/freezer.conf.j2 b/ansible/roles/freezer/templates/freezer.conf.j2 index 025d56bc4ca490d5d544869df3a2a145bf41db43..b48ec6c864eaf31e57bd261a731800bc0becb74c 100644 --- a/ansible/roles/freezer/templates/freezer.conf.j2 +++ b/ansible/roles/freezer/templates/freezer.conf.j2 @@ -31,6 +31,7 @@ project_name = service username = {{ freezer_keystone_user }} password = {{ freezer_keystone_password }} cafile = {{ openstack_cacert }} +region_name = {{ openstack_region_name }} memcache_security_strategy = ENCRYPT memcache_secret_key = {{ memcache_secret_key }} diff --git a/ansible/roles/glance/templates/glance-api.conf.j2 b/ansible/roles/glance/templates/glance-api.conf.j2 index d784df3ca8861be816161343cec976bf9f25e10e..2001b921c4f8f415362e2e9f426a69e1b6708403 100644 --- a/ansible/roles/glance/templates/glance-api.conf.j2 +++ b/ansible/roles/glance/templates/glance-api.conf.j2 @@ -50,6 +50,7 @@ project_name = service username = {{ glance_keystone_user }} password = {{ glance_keystone_password }} cafile = {{ openstack_cacert }} +region_name = {{ openstack_region_name }} memcache_security_strategy = ENCRYPT memcache_secret_key = {{ memcache_secret_key }} diff --git a/ansible/roles/gnocchi/templates/gnocchi.conf.j2 b/ansible/roles/gnocchi/templates/gnocchi.conf.j2 index 7d4d5122cad3eb48a6ac474a73eb8f5987e383fd..dc645160a54df5ccd6521ba984b3112f895f9e02 100644 --- a/ansible/roles/gnocchi/templates/gnocchi.conf.j2 +++ b/ansible/roles/gnocchi/templates/gnocchi.conf.j2 @@ -53,6 +53,7 @@ password = {{ gnocchi_keystone_password }} auth_url = {{ keystone_admin_url }} auth_type = password cafile = {{ openstack_cacert }} +region_name = {{ openstack_region_name }} memcache_security_strategy = ENCRYPT memcache_secret_key = {{ memcache_secret_key }} diff --git a/ansible/roles/heat/templates/heat.conf.j2 b/ansible/roles/heat/templates/heat.conf.j2 index 08f32be9abe4a491837991b68861fe47983f800e..a9fe31fdc7645541bfe54a578d04c1f91008adf9 100644 --- a/ansible/roles/heat/templates/heat.conf.j2 +++ b/ansible/roles/heat/templates/heat.conf.j2 @@ -52,6 +52,7 @@ project_name = service username = {{ heat_keystone_user }} password = {{ heat_keystone_password }} cafile = {{ openstack_cacert }} +region_name = {{ openstack_region_name }} memcache_security_strategy = ENCRYPT memcache_secret_key = {{ memcache_secret_key }} diff --git a/ansible/roles/ironic/templates/ironic-inspector.conf.j2 b/ansible/roles/ironic/templates/ironic-inspector.conf.j2 index ac7f62211e5975da31cd521321c9a9a4a2d81ab6..e3d87dfc24f580f1f52af55dcc7edbab2b89264c 100644 --- a/ansible/roles/ironic/templates/ironic-inspector.conf.j2 +++ b/ansible/roles/ironic/templates/ironic-inspector.conf.j2 @@ -29,6 +29,7 @@ username = {{ ironic_inspector_keystone_user }} password = {{ ironic_inspector_keystone_password }} os_endpoint_type = internalURL cafile = {{ openstack_cacert }} +region_name = {{ openstack_region_name }} {% else %} auth_type = none endpoint_override = {{ ironic_internal_endpoint }} @@ -45,6 +46,7 @@ project_name = service username = {{ ironic_inspector_keystone_user }} password = {{ ironic_inspector_keystone_password }} cafile = {{ openstack_cacert }} +region_name = {{ openstack_region_name }} memcache_security_strategy = ENCRYPT memcache_secret_key = {{ memcache_secret_key }} diff --git a/ansible/roles/magnum/templates/magnum.conf.j2 b/ansible/roles/magnum/templates/magnum.conf.j2 index f1d9742562f68121cc865f94c1673aed458cefcf..06f08c2980910d852c0a8563a9fba1bd7cce4d98 100644 --- a/ansible/roles/magnum/templates/magnum.conf.j2 +++ b/ansible/roles/magnum/templates/magnum.conf.j2 @@ -66,6 +66,7 @@ password = {{ magnum_keystone_password }} username = {{ magnum_keystone_user }} auth_type = password cafile = {{ openstack_cacert }} +region_name = {{ openstack_region_name }} [keystone_authtoken] auth_version = v3 @@ -77,6 +78,7 @@ user_domain_name = {{ default_user_domain_name }} project_name = service username = {{ magnum_keystone_user }} password = {{ magnum_keystone_password }} +region_name = {{ openstack_region_name }} memcache_security_strategy = ENCRYPT memcache_secret_key = {{ memcache_secret_key }} diff --git a/ansible/roles/manila/templates/manila.conf.j2 b/ansible/roles/manila/templates/manila.conf.j2 index 9bf62cadf7ee42865e9867b56cb7dd66919bac84..b9335c648a547499276200755313fe2e299617d2 100644 --- a/ansible/roles/manila/templates/manila.conf.j2 +++ b/ansible/roles/manila/templates/manila.conf.j2 @@ -40,6 +40,7 @@ project_name = service username = {{ manila_keystone_user }} password = {{ manila_keystone_password }} cafile = {{ openstack_cacert }} +region_name = {{ openstack_region_name }} memcache_security_strategy = ENCRYPT memcache_secret_key = {{ memcache_secret_key }} diff --git a/ansible/roles/mistral/templates/mistral.conf.j2 b/ansible/roles/mistral/templates/mistral.conf.j2 index c784c1105eee290d2d58f5ccac2d940dc9a7cf72..af604947b69dc5d824c8748a3fcfda0ca0fbd5a4 100644 --- a/ansible/roles/mistral/templates/mistral.conf.j2 +++ b/ansible/roles/mistral/templates/mistral.conf.j2 @@ -48,6 +48,7 @@ project_name = service username = {{ mistral_keystone_user }} password = {{ mistral_keystone_password }} cafile = {{ openstack_cacert }} +region_name = {{ openstack_region_name }} memcache_security_strategy = ENCRYPT memcache_secret_key = {{ memcache_secret_key }} diff --git a/ansible/roles/monasca/templates/monasca-api/api.conf.j2 b/ansible/roles/monasca/templates/monasca-api/api.conf.j2 index 9233c7ad3319f1bba59fc05ce65bc2a4c721a6e0..c42716e8bf8e559ba614ed403d4765e6c58bc3d2 100644 --- a/ansible/roles/monasca/templates/monasca-api/api.conf.j2 +++ b/ansible/roles/monasca/templates/monasca-api/api.conf.j2 @@ -44,6 +44,7 @@ username = {{ monasca_keystone_user }} password = {{ monasca_keystone_password }} service_token_roles_required=True cafile = {{ openstack_cacert }} +region_name = {{ openstack_region_name }} memcache_security_strategy = ENCRYPT memcache_secret_key = {{ memcache_secret_key }} diff --git a/ansible/roles/murano/templates/murano.conf.j2 b/ansible/roles/murano/templates/murano.conf.j2 index 5b9194a7743138108edabb1cd380bb14bc823768..64984bca74e3ee5563ecaa5a9fa4c8f9804218ca 100644 --- a/ansible/roles/murano/templates/murano.conf.j2 +++ b/ansible/roles/murano/templates/murano.conf.j2 @@ -30,6 +30,7 @@ project_name = service username = {{ murano_keystone_user }} password = {{ murano_keystone_password }} cafile = {{ openstack_cacert }} +region_name = {{ openstack_region_name }} memcache_security_strategy = ENCRYPT memcache_secret_key = {{ memcache_secret_key }} @@ -45,6 +46,7 @@ project_name = service username = {{ murano_keystone_user }} password = {{ murano_keystone_password }} cafile = {{ openstack_cacert }} +region_name = {{ openstack_region_name }} [murano] url = {{ murano_internal_endpoint }} @@ -89,6 +91,7 @@ username = {{ murano_keystone_user }} password = {{ murano_keystone_password }} user_domain_name = {{ default_project_domain_name }} cafile = {{ openstack_cacert }} +region_name = {{ openstack_region_name }} {% endif %} {% endif %} diff --git a/ansible/roles/neutron/templates/neutron.conf.j2 b/ansible/roles/neutron/templates/neutron.conf.j2 index 3462bb4d3bfb97675a4ceba817714143ab3882c3..b28496e2fb015a3b335320534f6ba5a51d0c442f 100644 --- a/ansible/roles/neutron/templates/neutron.conf.j2 +++ b/ansible/roles/neutron/templates/neutron.conf.j2 @@ -115,6 +115,7 @@ project_name = service username = {{ neutron_keystone_user }} password = {{ neutron_keystone_password }} cafile = {{ openstack_cacert }} +region_name = {{ openstack_region_name }} memcache_security_strategy = ENCRYPT memcache_secret_key = {{ memcache_secret_key }} @@ -167,6 +168,7 @@ allow_reverse_dns_lookup = True ipv4_ptr_zone_prefix_size = 24 ipv6_ptr_zone_prefix_size = 116 cafile = {{ openstack_cacert }} +region_name = {{ openstack_region_name }} {% endif %} {% if enable_osprofiler | bool %} @@ -188,6 +190,7 @@ project_domain_name = {{ default_project_domain_name }} os_region_name = {{ openstack_region_name }} os_interface = internal cafile = {{ openstack_cacert }} +region_name = {{ openstack_region_name }} [privsep] helper_command=sudo neutron-rootwrap /etc/neutron/rootwrap.conf privsep-helper diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2 index 74540fdac4f14b850e11b8c5aa3283ed399ba6f9..c30409f2bb27d010df98d6b8e19d2c4437496d74 100644 --- a/ansible/roles/nova/templates/nova.conf.j2 +++ b/ansible/roles/nova/templates/nova.conf.j2 @@ -115,6 +115,7 @@ project_name = service username = {{ nova_keystone_user }} password = {{ nova_keystone_password }} cafile = {{ openstack_cacert }} +region_name = {{ openstack_region_name }} memcache_security_strategy = ENCRYPT memcache_secret_key = {{ memcache_secret_key }} diff --git a/ansible/roles/octavia/templates/octavia.conf.j2 b/ansible/roles/octavia/templates/octavia.conf.j2 index 0b581c8675b742ce45123afd0fa3c887fb926a52..6190a97f7e7267a2549b1faf311bd38abebbc122 100644 --- a/ansible/roles/octavia/templates/octavia.conf.j2 +++ b/ansible/roles/octavia/templates/octavia.conf.j2 @@ -66,6 +66,7 @@ project_name = service username = {{ octavia_keystone_user }} password = {{ octavia_keystone_password }} cafile = {{ openstack_cacert }} +region_name = {{ openstack_region_name }} memcache_security_strategy = ENCRYPT memcache_secret_key = {{ memcache_secret_key }} diff --git a/ansible/roles/placement/templates/placement.conf.j2 b/ansible/roles/placement/templates/placement.conf.j2 index b8c64321a7d672d88a741b49fe0c0558571b2f87..04ca66fa900278e49c426ba26fc2099a2134f772 100644 --- a/ansible/roles/placement/templates/placement.conf.j2 +++ b/ansible/roles/placement/templates/placement.conf.j2 @@ -44,6 +44,7 @@ project_name = service username = {{ placement_keystone_user }} password = {{ placement_keystone_password }} cafile = {{ openstack_cacert }} +region_name = {{ openstack_region_name }} memcache_security_strategy = ENCRYPT memcache_secret_key = {{ memcache_secret_key }} diff --git a/ansible/roles/sahara/templates/sahara.conf.j2 b/ansible/roles/sahara/templates/sahara.conf.j2 index c982e375e8ea7a4c583dda29d70b5618719cb0a7..67c128847020224ccdf9c6a32e16e76e1a8a9a74 100644 --- a/ansible/roles/sahara/templates/sahara.conf.j2 +++ b/ansible/roles/sahara/templates/sahara.conf.j2 @@ -24,6 +24,7 @@ project_domain_name = {{ default_project_domain_name }} username = {{ sahara_keystone_user }} password = {{ sahara_keystone_password }} cafile = {{ openstack_cacert }} +region_name = {{ openstack_region_name }} memcache_security_strategy = ENCRYPT memcache_secret_key = {{ memcache_secret_key }} diff --git a/ansible/roles/senlin/templates/senlin.conf.j2 b/ansible/roles/senlin/templates/senlin.conf.j2 index 5879a8f2225da459d981424612deee28f42154e5..91064bcbac1cefbdf1170a5ef60fdcd78666597d 100644 --- a/ansible/roles/senlin/templates/senlin.conf.j2 +++ b/ansible/roles/senlin/templates/senlin.conf.j2 @@ -52,6 +52,7 @@ username = {{ senlin_keystone_user }} password = {{ senlin_keystone_password }} service_token_roles_required = False cafile = {{ openstack_cacert }} +region_name = {{ openstack_region_name }} memcache_security_strategy = ENCRYPT memcache_secret_key = {{ memcache_secret_key }} diff --git a/ansible/roles/solum/templates/solum.conf.j2 b/ansible/roles/solum/templates/solum.conf.j2 index c641b2312cfc4b112bbe77bb2a3cba9169a1e4cd..9af1c3150126f6a8d992c3190ede4ec219cadea3 100644 --- a/ansible/roles/solum/templates/solum.conf.j2 +++ b/ansible/roles/solum/templates/solum.conf.j2 @@ -57,6 +57,7 @@ project_name = service username = {{ solum_keystone_user }} password = {{ solum_keystone_password }} cafile = {{ openstack_cacert }} +region_name = {{ openstack_region_name }} memcache_security_strategy = ENCRYPT memcache_secret_key = {{ memcache_secret_key }} diff --git a/ansible/roles/tacker/templates/tacker.conf.j2 b/ansible/roles/tacker/templates/tacker.conf.j2 index 4f8928755512cb1e58252ce2b107d0ed53fab52f..dee94b7af7fd860e3b4ea3c75b8ce7a8ddda26fc 100644 --- a/ansible/roles/tacker/templates/tacker.conf.j2 +++ b/ansible/roles/tacker/templates/tacker.conf.j2 @@ -41,6 +41,7 @@ project_name = service username = {{ tacker_keystone_user }} password = {{ tacker_keystone_password }} cafile = {{ openstack_cacert }} +region_name = {{ openstack_region_name }} memcache_security_strategy = ENCRYPT memcache_secret_key = {{ memcache_secret_key }} diff --git a/ansible/roles/trove/templates/trove.conf.j2 b/ansible/roles/trove/templates/trove.conf.j2 index 4c1232cc2a91b91d6b9e42fe274b39e6b4977de2..e7a2d2f016b519caf765ed0502ade4abd465169f 100644 --- a/ansible/roles/trove/templates/trove.conf.j2 +++ b/ansible/roles/trove/templates/trove.conf.j2 @@ -59,6 +59,7 @@ password = {{ trove_keystone_password }} auth_url = {{ keystone_admin_url }} auth_type = password cafile = {{ openstack_cacert }} +region_name = {{ openstack_region_name }} [oslo_messaging_notifications] transport_url = {{ notify_transport_url }} diff --git a/ansible/roles/vitrage/templates/vitrage.conf.j2 b/ansible/roles/vitrage/templates/vitrage.conf.j2 index e007c03cd0c6f4880b9114fe0bde8eb7be99477d..3fdaa2f9fb41fcd7bd298c9017bd1f1e594bf2df 100644 --- a/ansible/roles/vitrage/templates/vitrage.conf.j2 +++ b/ansible/roles/vitrage/templates/vitrage.conf.j2 @@ -42,6 +42,7 @@ username = {{ vitrage_keystone_user }} password = {{ vitrage_keystone_password }} service_token_roles_required = True cafile = {{ openstack_cacert }} +region_name = {{ openstack_region_name }} memcache_security_strategy = ENCRYPT memcache_secret_key = {{ memcache_secret_key }} diff --git a/ansible/roles/watcher/templates/watcher.conf.j2 b/ansible/roles/watcher/templates/watcher.conf.j2 index 3f655da1dc4694d95007ab0a85cd92979ab63fc0..467e0b5b0664991defab215e84d3056efeef9b45 100644 --- a/ansible/roles/watcher/templates/watcher.conf.j2 +++ b/ansible/roles/watcher/templates/watcher.conf.j2 @@ -29,6 +29,7 @@ username = {{ watcher_keystone_user }} password = {{ watcher_keystone_password }} service_token_roles_required = True cafile = {{ openstack_cacert }} +region_name = {{ openstack_region_name }} memcache_security_strategy = ENCRYPT memcache_secret_key = {{ memcache_secret_key }} diff --git a/releasenotes/notes/bug-1933025-1cb5d64d20d57be7.yaml b/releasenotes/notes/bug-1933025-1cb5d64d20d57be7.yaml new file mode 100644 index 0000000000000000000000000000000000000000..ab85f4947cbc3c65351bf0bf5043654913e026dd --- /dev/null +++ b/releasenotes/notes/bug-1933025-1cb5d64d20d57be7.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fixes missing region_name in keystone_auth sections. + See `bug 1933025 + <https://bugs.launchpad.net/kolla-ansible/+bug/1933025>`__ for details.