From aea79e7e520be68637dcf2039d106736ee643245 Mon Sep 17 00:00:00 2001 From: Jimmy McCrory Date: Tue, 27 Feb 2018 16:33:44 +0000 Subject: [PATCH] Remove unused keystone service variables The keystone_service admin, public, and internal url and v3 variables were only used in documented examples for federation, not in any tasks. Change-Id: Ia8a0f8c945f83a5974c4a74890e73002cf219158 --- defaults/main.yml | 13 ++----------- doc/source/configure-federation-idp.rst | 4 ++-- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index a7734969..72130aa6 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -153,15 +153,6 @@ keystone_service_publicuri: "{{ keystone_service_publicuri_proto }}://{{ externa keystone_service_internaluri: "{{ keystone_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ keystone_service_port }}" keystone_service_adminuri: "{{ keystone_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ keystone_admin_port }}" -keystone_service_publicurl_v3: "{{ keystone_service_publicuri }}/v3" -keystone_service_internalurl_v3: "{{ keystone_service_internaluri }}/v3" -keystone_service_adminurl_v3: "{{ keystone_service_adminuri }}/v3" - -keystone_service_publicurl: "{{ keystone_service_publicurl_v3 }}" -keystone_service_internalurl: "{{ keystone_service_internalurl_v3 }}" -keystone_service_adminurl: "{{ keystone_service_adminurl_v3 }}" - - ## Set this value to override the "public_endpoint" keystone.conf variable #keystone_public_endpoint: "{{ keystone_service_publicuri }}" @@ -295,8 +286,8 @@ keystone_idp: {} # keyfile: "/etc/keystone/ssl/idp_signing_key.pem" # self_signed_cert_subject: "/C=US/ST=Texas/L=San Antonio/O=IT/CN={{ external_lb_vip_address }}" # regen_cert: false -# idp_entity_id: "{{ keystone_service_publicurl_v3 }}/OS-FEDERATION/saml2/idp" -# idp_sso_endpoint: "{{ keystone_service_publicurl_v3 }}/OS-FEDERATION/saml2/sso" +# idp_entity_id: "{{ keystone_service_publicuri }}/v3//OS-FEDERATION/saml2/idp" +# idp_sso_endpoint: "{{ keystone_service_publicuri }}/v3/OS-FEDERATION/saml2/sso" # idp_metadata_path: /etc/keystone/saml2_idp_metadata.xml # service_providers: # - id: "sp_1" diff --git a/doc/source/configure-federation-idp.rst b/doc/source/configure-federation-idp.rst index 31a188ce..7a499af0 100644 --- a/doc/source/configure-federation-idp.rst +++ b/doc/source/configure-federation-idp.rst @@ -13,8 +13,8 @@ complete example: keyfile: "/etc/keystone/ssl/idp_signing_key.pem" self_signed_cert_subject: "/C=US/ST=Texas/L=San Antonio/O=IT/CN={{ external_lb_vip_address }}" regen_cert: false - idp_entity_id: "{{ keystone_service_publicurl_v3 }}/OS-FEDERATION/saml2/idp" - idp_sso_endpoint: "{{ keystone_service_publicurl_v3 }}/OS-FEDERATION/saml2/sso" + idp_entity_id: "{{ keystone_service_publicuri }}/v3/OS-FEDERATION/saml2/idp" + idp_sso_endpoint: "{{ keystone_service_publicuri }}/v3/OS-FEDERATION/saml2/sso" idp_metadata_path: /etc/keystone/saml2_idp_metadata.xml service_providers: - id: "sp_1"