diff options
| author |   Markos Chandras <mchandras@suse.de> | 2018-08-28 14:55:28 +0100 |
|---|---|---|
| committer | Markos Chandras <mchandras@suse.de> | 2018-09-03 08:01:04 +0100 |
| commit | cc583f30f881ba956fb4f1402aa4dd1608b27da2 (patch) | |
| tree | 096fd5c5b96fd8a14cb0a77c16e44990c1392d91 /xci/installer/osa/files | |
| parent | ba0f4d74ff7505055a1fd911fd40a760a3370baf (diff) | |
Revert "xci: osa: Disable haproxy ssl configuration"
This reverts commit 42501f0ef7e0f0729b1c780102fb9713ef383fb3.
This also removes the entire SSL management code and we let the
haproxy_server role generate the certificates for us.
We also need to bump the openrc role to include an upstream patch
which fixes the openrc template file.
deploy-scenario:os-nosdn-nofeature
installer-type:osa
Change-Id: I9bb590c9f1d5bc63519cfb4794dc15f794cc5b07
Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'xci/installer/osa/files')
4 files changed, 8 insertions, 16 deletions
diff --git a/xci/installer/osa/files/ansible-role-requirements.yml b/xci/installer/osa/files/ansible-role-requirements.yml index 5905dc51..c958a2fc 100644 --- a/xci/installer/osa/files/ansible-role-requirements.yml +++ b/xci/installer/osa/files/ansible-role-requirements.yml @@ -64,7 +64,8 @@ - name: openstack_openrc scm: git src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc - version: 33d59ddb00f27e9a2a3bb816621a55efd1b37ba7 + version: 3b31242d4ecde28ac747dff83568f202112c79bf + refspec: refs/changes/78/598978/2 - name: os_aodh scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_aodh diff --git a/xci/installer/osa/files/ha/user_variables.yml b/xci/installer/osa/files/ha/user_variables.yml index c51a6e12..8c2e9f0c 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: "http://192.168.122.220:5000/v3" +openrc_os_auth_url: "https://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,9 +163,6 @@ 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" +openrc_insecure: true keystone_service_adminuri_insecure: true keystone_service_internaluri_insecure: true diff --git a/xci/installer/osa/files/mini/user_variables.yml b/xci/installer/osa/files/mini/user_variables.yml index ef56dd2c..b4d847bc 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: "http://192.168.122.3:5000/v3" +openrc_os_auth_url: "https://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,9 +163,6 @@ 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" +openrc_insecure: true keystone_service_adminuri_insecure: true keystone_service_internaluri_insecure: true diff --git a/xci/installer/osa/files/noha/user_variables.yml b/xci/installer/osa/files/noha/user_variables.yml index 4e578819..5e7ed83c 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: "http://192.168.122.3:5000/v3" +openrc_os_auth_url: "https://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,9 +163,6 @@ 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" +openrc_insecure: true keystone_service_adminuri_insecure: true keystone_service_internaluri_insecure: true |