From c4577ab8e25de985ef82f9a86de8f7d4a3829e98 Mon Sep 17 00:00:00 2001 From: Mohammed Naser Date: Thu, 28 Mar 2019 21:56:31 -0400 Subject: [PATCH] gate: switch all public URLs to use HTTP for metal At the moment, the gate does not deploy HAproxy inside baremetal scenarios therefore we don't have any SSL on the public interfaces. This changes updates it so that all of the URLs inside the service catalog are functional. Change-Id: I77cb905b8668374fdb0677741a800d30b7e262ca --- .../templates/user_variables.aio.yml.j2 | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 index ee35e346a8..4ce689f87c 100644 --- a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 @@ -40,6 +40,12 @@ galera_wsrep_provider_options: ## Repo repo_nginx_threads: 2 +{% if 'metal' in bootstrap_host_scenario %} +# NOTE(mnaser): We don't currently deploy HAproxy in metal scenarios therefore +# all URLs which be using HTTP instead of HTTPS. +openstack_service_publicuri_proto: http +{% endif %} + ## Keystone keystone_httpd_mpm_start_servers: 2 keystone_httpd_mpm_min_spare_threads: 1 @@ -52,14 +58,6 @@ keystone_wsgi_processes_max: 2 ## Barbican barbican_wsgi_processes: 2 barbican_wsgi_threads: 1 -{% if 'metal' in bootstrap_host_scenario %} -# NOTE(mnaser): Barbican's tempest plugin does not support specific endpoints -# in it's config which result in it attempting to use the public -# URL which does not have any SSL encryption by default in metal -# jobs. We should remove this once we have HAproxy running in -# our metal scenarios. -barbican_service_publicuri_proto: http -{% endif %} ## Cinder cinder_wsgi_processes_max: 2