diff --git a/barbican/values.yaml b/barbican/values.yaml index 8837d90674..c18d193955 100644 --- a/barbican/values.yaml +++ b/barbican/values.yaml @@ -546,8 +546,6 @@ endpoints: default: null path: default: /v3 - public: /identity/v3 - admin: /identity_admin/v3 scheme: default: http port: diff --git a/ceilometer/values.yaml b/ceilometer/values.yaml index a59ecbb527..48804fdaa0 100644 --- a/ceilometer/values.yaml +++ b/ceilometer/values.yaml @@ -1707,8 +1707,6 @@ endpoints: default: null path: default: /v3 - public: /identity/v3 - admin: /identity_admin/v3 scheme: default: 'http' port: diff --git a/ceph-client/values.yaml b/ceph-client/values.yaml index 88d8b12990..35679253e5 100644 --- a/ceph-client/values.yaml +++ b/ceph-client/values.yaml @@ -451,8 +451,6 @@ endpoints: default: null path: default: /v3 - public: /identity/v3 - admin: /identity_admin/v3 scheme: default: http port: diff --git a/cinder/values.yaml b/cinder/values.yaml index cbaf15408b..d5a27b0c2d 100644 --- a/cinder/values.yaml +++ b/cinder/values.yaml @@ -1070,8 +1070,6 @@ endpoints: default: null path: default: /v3 - public: /identity/v3 - admin: /identity_admin/v3 scheme: default: http port: diff --git a/congress/values.yaml b/congress/values.yaml index 581d73e61b..c07bc0f138 100644 --- a/congress/values.yaml +++ b/congress/values.yaml @@ -245,8 +245,6 @@ endpoints: default: null path: default: /v3 - public: /identity/v3 - admin: /identity_admin/v3 scheme: default: http port: diff --git a/glance/values.yaml b/glance/values.yaml index 378ff0fda0..b1840f1142 100644 --- a/glance/values.yaml +++ b/glance/values.yaml @@ -575,8 +575,6 @@ endpoints: default: null path: default: /v3 - public: /identity/v3 - admin: /identity_admin/v3 scheme: default: http port: diff --git a/gnocchi/values.yaml b/gnocchi/values.yaml index b4c6607802..82117a2ac7 100644 --- a/gnocchi/values.yaml +++ b/gnocchi/values.yaml @@ -486,8 +486,6 @@ endpoints: default: null path: default: /v3 - public: /identity/v3 - admin: /identity_admin/v3 scheme: default: 'http' port: diff --git a/heat/values.yaml b/heat/values.yaml index 3f26f116f0..d5e15f3216 100644 --- a/heat/values.yaml +++ b/heat/values.yaml @@ -812,8 +812,6 @@ endpoints: default: null path: default: /v3 - public: /identity/v3 - admin: /identity_admin/v3 scheme: default: 'http' port: diff --git a/ironic/values.yaml b/ironic/values.yaml index 27da1520fd..44107e97a9 100644 --- a/ironic/values.yaml +++ b/ironic/values.yaml @@ -400,8 +400,6 @@ endpoints: default: null path: default: /v3 - public: /identity/v3 - admin: /identity_admin/v3 scheme: default: http port: diff --git a/keystone/templates/bin/_keystone-api.sh.tpl b/keystone/templates/bin/_keystone-api.sh.tpl index cfb9be56fc..217d9422d2 100644 --- a/keystone/templates/bin/_keystone-api.sh.tpl +++ b/keystone/templates/bin/_keystone-api.sh.tpl @@ -22,7 +22,7 @@ COMMAND="${@:-start}" function start () { - for KEYSTONE_WSGI_SCRIPT in keystone-wsgi-public keystone-wsgi-admin; do + for KEYSTONE_WSGI_SCRIPT in keystone-wsgi-public; do cp -a $(type -p ${KEYSTONE_WSGI_SCRIPT}) /var/www/cgi-bin/keystone/ done diff --git a/keystone/templates/deployment-api.yaml b/keystone/templates/deployment-api.yaml index f5fad6e984..beb6d11ccb 100644 --- a/keystone/templates/deployment-api.yaml +++ b/keystone/templates/deployment-api.yaml @@ -66,13 +66,8 @@ spec: - stop ports: {{- $portInt := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} - {{- $portAdm := tuple "identity" "admin" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} - name: ks-pub containerPort: {{ $portInt }} - {{- if not ( eq $portInt $portAdm ) }} - - name: ks-adm - containerPort: {{ $portAdm }} - {{- end }} readinessProbe: httpGet: scheme: HTTP diff --git a/keystone/templates/etc/_wsgi-keystone.conf.tpl b/keystone/templates/etc/_wsgi-keystone.conf.tpl index 878d364fbe..1ba01856ae 100644 --- a/keystone/templates/etc/_wsgi-keystone.conf.tpl +++ b/keystone/templates/etc/_wsgi-keystone.conf.tpl @@ -15,12 +15,8 @@ limitations under the License. */}} {{- $portInt := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} -{{- $portAdm := tuple "identity" "admin" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} Listen 0.0.0.0:{{ $portInt }} -{{- if not ( eq $portInt $portAdm ) }} -Listen 0.0.0.0:{{ $portAdm }} -{{- end }} LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy @@ -44,55 +40,3 @@ CustomLog /dev/stdout proxy env=forwarded CustomLog /dev/stdout combined env=!forwarded CustomLog /dev/stdout proxy env=forwarded - -{{- if not ( eq $portInt $portAdm ) }} - - WSGIDaemonProcess keystone-admin processes=1 threads=1 user=keystone group=keystone display-name=%{GROUP} - WSGIProcessGroup keystone-admin - WSGIScriptAlias / /var/www/cgi-bin/keystone/keystone-wsgi-admin - WSGIApplicationGroup %{GLOBAL} - WSGIPassAuthorization On - = 2.4> - ErrorLogFormat "%{cu}t %M" - - ErrorLog /dev/stderr - - SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded - CustomLog /dev/stdout combined env=!forwarded - CustomLog /dev/stdout proxy env=forwarded - -{{- else }} -WSGIDaemonProcess keystone-admin processes=1 threads=1 user=keystone group=keystone display-name=%{GROUP} -WSGIProcessGroup keystone-admin -WSGIScriptAlias / /var/www/cgi-bin/keystone/keystone-wsgi-admin -WSGIApplicationGroup %{GLOBAL} -WSGIPassAuthorization On -= 2.4> - ErrorLogFormat "%{cu}t %M" - -ErrorLog /dev/stderr - -SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded -CustomLog /dev/stdout combined env=!forwarded -CustomLog /dev/stdout proxy env=forwarded -{{- end }} - -Alias /identity /var/www/cgi-bin/keystone/keystone-wsgi-public - - SetHandler wsgi-script - Options +ExecCGI - - WSGIProcessGroup keystone-public - WSGIApplicationGroup %{GLOBAL} - WSGIPassAuthorization On - - -Alias /identity_admin /var/www/cgi-bin/keystone/keystone-wsgi-admin - - SetHandler wsgi-script - Options +ExecCGI - - WSGIProcessGroup keystone-admin - WSGIApplicationGroup %{GLOBAL} - WSGIPassAuthorization On - diff --git a/keystone/templates/service-api.yaml b/keystone/templates/service-api.yaml index 717cf0f3f3..a00c6ef66a 100644 --- a/keystone/templates/service-api.yaml +++ b/keystone/templates/service-api.yaml @@ -24,19 +24,11 @@ metadata: spec: ports: {{- $portInt := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} - {{- $portAdm := tuple "identity" "admin" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} - name: ks-pub port: {{ tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} {{ if .Values.network.api.node_port.enabled }} nodePort: {{ .Values.network.api.node_port.port }} {{ end }} - {{- if not ( eq $portInt $portAdm ) }} - - name: ks-adm - port: {{ tuple "identity" "admin" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} - {{ if .Values.network.admin.node_port.enabled }} - nodePort: {{ .Values.network.admin.node_port.port }} - {{ end }} - {{- end }} selector: {{ tuple $envAll "keystone" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} {{ if or (.Values.network.api.node_port.enabled) (.Values.network.admin.node_port.enabled) }} diff --git a/keystone/values.yaml b/keystone/values.yaml index cb5a121804..dfa0c7cc5c 100644 --- a/keystone/values.yaml +++ b/keystone/values.yaml @@ -402,10 +402,6 @@ conf: use: egg:keystone#service_v3 app:admin_service: use: egg:keystone#admin_service - pipeline:public_api: - pipeline: cors sizelimit http_proxy_to_wsgi osprofiler url_normalize request_id build_auth_context token_auth json_body ec2_extension public_service - pipeline:admin_api: - pipeline: cors sizelimit http_proxy_to_wsgi osprofiler url_normalize request_id build_auth_context token_auth json_body ec2_extension s3_extension admin_service pipeline:api_v3: pipeline: cors sizelimit http_proxy_to_wsgi osprofiler url_normalize request_id build_auth_context token_auth json_body ec2_extension_v3 s3_extension service_v3 app:public_version_service: @@ -418,12 +414,10 @@ conf: pipeline: cors sizelimit osprofiler url_normalize admin_version_service composite:main: use: egg:Paste#urlmap - /v2.0: public_api /v3: api_v3 /: public_version_api composite:admin: use: egg:Paste#urlmap - /v2.0: admin_api /v3: api_v3 /: admin_version_api policy: @@ -927,8 +921,6 @@ endpoints: # key: null path: default: /v3 - public: /identity/v3 - admin: /identity_admin/v3 scheme: default: http port: diff --git a/magnum/values.yaml b/magnum/values.yaml index 2f52f234c6..e42413f38c 100644 --- a/magnum/values.yaml +++ b/magnum/values.yaml @@ -358,8 +358,6 @@ endpoints: default: null path: default: /v3 - public: /identity/v3 - admin: /identity_admin/v3 scheme: default: http port: diff --git a/mistral/values.yaml b/mistral/values.yaml index 99bf6bac28..42c68b2ecb 100644 --- a/mistral/values.yaml +++ b/mistral/values.yaml @@ -242,8 +242,6 @@ endpoints: default: null path: default: /v3 - public: /identity/v3 - admin: /identity_admin/v3 scheme: default: http port: diff --git a/neutron/values.yaml b/neutron/values.yaml index db3fa0760b..ae36c5c0a6 100644 --- a/neutron/values.yaml +++ b/neutron/values.yaml @@ -1776,8 +1776,6 @@ endpoints: default: null path: default: /v3 - public: /identity/v3 - admin: /identity_admin/v3 scheme: default: http port: diff --git a/nova/values.yaml b/nova/values.yaml index ced9b724ae..3cc3a8edd9 100644 --- a/nova/values.yaml +++ b/nova/values.yaml @@ -1786,8 +1786,6 @@ endpoints: default: null path: default: /v3 - public: /identity/v3 - admin: /identity_admin/v3 scheme: default: http port: diff --git a/rally/values.yaml b/rally/values.yaml index 345df13c69..b20abf273f 100644 --- a/rally/values.yaml +++ b/rally/values.yaml @@ -255,8 +255,6 @@ endpoints: default: null path: default: /v3 - public: /identity/v3 - admin: /identity_admin/v3 scheme: default: http port: diff --git a/senlin/values.yaml b/senlin/values.yaml index 04e78bdc77..9a1856ca39 100644 --- a/senlin/values.yaml +++ b/senlin/values.yaml @@ -407,8 +407,6 @@ endpoints: default: null path: default: /v3 - public: /identity/v3 - admin: /identity_admin/v3 scheme: default: http port: diff --git a/tempest/values.yaml b/tempest/values.yaml index 58ea165cff..57b387b8eb 100644 --- a/tempest/values.yaml +++ b/tempest/values.yaml @@ -250,8 +250,6 @@ endpoints: default: null path: default: /v3 - public: /identity/v3 - admin: /identity_admin/v3 scheme: default: http port: diff --git a/tools/deployment/common/setup-client.sh b/tools/deployment/common/setup-client.sh index 73a3e1d2cf..400c5b62b7 100755 --- a/tools/deployment/common/setup-client.sh +++ b/tools/deployment/common/setup-client.sh @@ -32,7 +32,7 @@ clouds: project_name: 'admin' project_domain_name: 'default' user_domain_name: 'default' - auth_url: 'http://keystone.openstack.svc.cluster.local/identity/v3' + auth_url: 'http://keystone.openstack.svc.cluster.local/v3' EOF #NOTE: Build charts