Code Review / releng-xci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: f6b2b8c)
xci: osa: Disable haproxy ssl configuration 35/59535/1
authorMarkos Chandras <mchandras@suse.de>
Tue, 3 Jul 2018 14:04:01 +0000 (15:04 +0100)
committerMarkos Chandras <mchandras@suse.de>
Wed, 4 Jul 2018 05:19:12 +0000 (06:19 +0100)
The self-signed certificates are causing troubles so until we implement
a proper certificate chain in XCI we should disable the SSL endpoints.

Change-Id: Ife4ef78de1569121c435a806924a3f90917fd85b
Signed-off-by: Markos Chandras <mchandras@suse.de>
xci/installer/osa/files/ha/user_variables.yml patch | blob | history
xci/installer/osa/files/mini/user_variables.yml patch | blob | history
xci/installer/osa/files/noha/user_variables.yml patch | blob | history

diff --git a/xci/installer/osa/files/ha/user_variables.yml b/xci/installer/osa/files/ha/user_variables.yml
index c6f1b06..c51a6e1 100644 (file)
--- a/xci/installer/osa/files/ha/user_variables.yml
+++ b/xci/installer/osa/files/ha/user_variables.yml
@@ -154,7 +154,7 @@ trove_wsgi_processes: 1
 sahara_api_workers_max: 2
 sahara_api_workers: 1
 
-openrc_os_auth_url: "https://192.168.122.220:5000/v3"
+openrc_os_auth_url: "http://192.168.122.220:5000/v3"
 keystone_auth_admin_password: "opnfv-secret-password"
 openrc_os_password: "opnfv-secret-password"
 openrc_os_domain_name: "Default"
@@ -163,6 +163,8 @@ openrc_nova_endpoint_type: "publicURL"
 openrc_os_endpoint_type: "publicURL"
 openrc_clouds_yml_interface: "public"
 openrc_region_name: RegionOne
+haproxy_ssl: false
+openstack_service_publicuri_proto: http
 haproxy_user_ssl_cert: "/etc/ssl/certs/xci.crt"
 haproxy_user_ssl_key: "/etc/ssl/private/xci.key"
 keystone_service_adminuri_insecure: true
diff --git a/xci/installer/osa/files/mini/user_variables.yml b/xci/installer/osa/files/mini/user_variables.yml
index 9fb2001..ef56dd2 100644 (file)
--- a/xci/installer/osa/files/mini/user_variables.yml
+++ b/xci/installer/osa/files/mini/user_variables.yml
@@ -154,7 +154,7 @@ trove_wsgi_processes: 1
 sahara_api_workers_max: 2
 sahara_api_workers: 1
 
-openrc_os_auth_url: "https://192.168.122.3:5000/v3"
+openrc_os_auth_url: "http://192.168.122.3:5000/v3"
 keystone_auth_admin_password: "opnfv-secret-password"
 openrc_os_password: "opnfv-secret-password"
 openrc_os_domain_name: "Default"
@@ -163,6 +163,8 @@ openrc_nova_endpoint_type: "publicURL"
 openrc_os_endpoint_type: "publicURL"
 openrc_clouds_yml_interface: "public"
 openrc_region_name: RegionOne
+haproxy_ssl: false
+openstack_service_publicuri_proto: http
 haproxy_user_ssl_cert: "/etc/ssl/certs/xci.crt"
 haproxy_user_ssl_key: "/etc/ssl/private/xci.key"
 keystone_service_adminuri_insecure: true
diff --git a/xci/installer/osa/files/noha/user_variables.yml b/xci/installer/osa/files/noha/user_variables.yml
index 9545093..4e57881 100644 (file)
--- a/xci/installer/osa/files/noha/user_variables.yml
+++ b/xci/installer/osa/files/noha/user_variables.yml
@@ -154,7 +154,7 @@ trove_wsgi_processes: 1
 sahara_api_workers_max: 2
 sahara_api_workers: 1
 
-openrc_os_auth_url: "https://192.168.122.3:5000/v3"
+openrc_os_auth_url: "http://192.168.122.3:5000/v3"
 keystone_auth_admin_password: "opnfv-secret-password"
 openrc_os_password: "opnfv-secret-password"
 openrc_os_domain_name: "Default"
@@ -163,6 +163,8 @@ openrc_nova_endpoint_type: "publicURL"
 openrc_os_endpoint_type: "publicURL"
 openrc_clouds_yml_interface: "public"
 openrc_region_name: RegionOne
+haproxy_ssl: false
+openstack_service_publicuri_proto: http
 haproxy_user_ssl_cert: "/etc/ssl/certs/xci.crt"
 haproxy_user_ssl_key: "/etc/ssl/private/xci.key"
 keystone_service_adminuri_insecure: true