diff options
| author |   Markos Chandras <mchandras@suse.de> | 2018-07-05 07:51:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-07-05 07:51:11 +0000 |
| commit | c92a83f4fd4b4f104813a58faa6d7a674f8d6cec (patch) | |
| tree | 236be39ede0dcbd3e390506209232d8ff616f18c | |
| parent | 82ff11255525f67e726a26616e45845bc49fbb23 (diff) | |
| parent | 42501f0ef7e0f0729b1c780102fb9713ef383fb3 (diff) | |
Merge "xci: osa: Disable haproxy ssl configuration"
| -rw-r--r-- | xci/installer/osa/files/ha/user_variables.yml | 4 | ||||
| -rw-r--r-- | xci/installer/osa/files/mini/user_variables.yml | 4 | ||||
| -rw-r--r-- | xci/installer/osa/files/noha/user_variables.yml | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/xci/installer/osa/files/ha/user_variables.yml b/xci/installer/osa/files/ha/user_variables.yml index c6f1b065..c51a6e12 100644 --- 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 9fb2001e..ef56dd2c 100644 --- 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 95450937..4e578819 100644 --- 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 |