Merge "Keystone: Update admin port declaration to use standard layout"

2018-07-25 23:31:02 +00:00 · 2018-07-25 23:31:02 +00:00 · 71439d1b67
commit 71439d1b67
parent a3270762cc ec2f9d0808
22 changed files with 23 additions and 41 deletions
--- a/barbican/values.yaml
+++ b/barbican/values.yaml
@ -550,10 +550,9 @@ endpoints:
    scheme:
      default: http
    port:
-      admin:
-        default: 35357
      api:
        default: 80
+        admin: 35357
  key_manager:
    name: barbican
    hosts:
--- a/ceilometer/values.yaml
+++ b/ceilometer/values.yaml
@ -1710,10 +1710,9 @@ endpoints:
    scheme:
      default: 'http'
    port:
-      admin:
-        default: 35357
      api:
        default: 80
+        admin: 35357
  metering:
    name: ceilometer
    hosts:
--- a/ceph-client/values.yaml
+++ b/ceph-client/values.yaml
@ -454,10 +454,9 @@ endpoints:
    scheme:
      default: http
    port:
-      admin:
-        default: 35357
      api:
        default: 80
+        admin: 35357
  object_store:
    name: swift
    namespace: null
--- a/cinder/values.yaml
+++ b/cinder/values.yaml
@ -1074,10 +1074,9 @@ endpoints:
    scheme:
      default: http
    port:
-      admin:
-        default: 35357
      api:
        default: 80
+        admin: 35357
  image:
    name: glance
    hosts:
--- a/congress/values.yaml
+++ b/congress/values.yaml
@ -248,10 +248,9 @@ endpoints:
    scheme:
      default: http
    port:
-      admin:
-        default: 35357
      api:
        default: 80
+        admin: 35357
  policy:
    name: congress
    hosts:
--- a/glance/values.yaml
+++ b/glance/values.yaml
@ -574,10 +574,9 @@ endpoints:
    scheme:
      default: http
    port:
-      admin:
-        default: 35357
      api:
        default: 80
+        admin: 35357
  image:
    name: glance
    hosts:
--- a/gnocchi/values.yaml
+++ b/gnocchi/values.yaml
@ -489,10 +489,9 @@ endpoints:
    scheme:
      default: 'http'
    port:
-      admin:
-        default: 35357
      api:
        default: 80
+        admin: 35357
  metric:
    name: gnocchi
    hosts:
--- a/heat/values.yaml
+++ b/heat/values.yaml
@ -816,10 +816,9 @@ endpoints:
    scheme:
      default: 'http'
    port:
-      admin:
-        default: 35357
      api:
        default: 80
+        admin: 35357
  orchestration:
    name: heat
    hosts:
--- a/horizon/values.yaml
+++ b/horizon/values.yaml
@ -2008,10 +2008,9 @@ endpoints:
    scheme:
      default: http
    port:
-      admin:
-        default: 35357
      api:
        default: 80
+        admin: 35357
  oslo_cache:
    hosts:
      default: memcached
--- a/ironic/values.yaml
+++ b/ironic/values.yaml
@ -404,10 +404,9 @@ endpoints:
    scheme:
      default: http
    port:
-      admin:
-        default: 35357
      api:
        default: 80
+        admin: 35357
  baremetal:
    name: ironic
    hosts:
--- a/keystone/templates/deployment-api.yaml
+++ b/keystone/templates/deployment-api.yaml
@ -68,7 +68,7 @@ spec:
            - name: ks-pub
              containerPort: {{ tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
            - name: ks-adm
-              containerPort: {{ tuple "identity" "internal" "admin" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+              containerPort: {{ tuple "identity" "admin" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
          readinessProbe:
            httpGet:
              scheme: HTTP
--- a/keystone/templates/etc/_wsgi-keystone.conf.tpl
+++ b/keystone/templates/etc/_wsgi-keystone.conf.tpl
@ -15,7 +15,7 @@ limitations under the License.
 */}}

 Listen 0.0.0.0:{{ tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
-Listen 0.0.0.0:{{ tuple "identity" "internal" "admin" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+Listen 0.0.0.0:{{ tuple "identity" "admin" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}

 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
@ -40,7 +40,7 @@ CustomLog /dev/stdout proxy env=forwarded
    CustomLog /dev/stdout proxy env=forwarded
 </VirtualHost>

-<VirtualHost *:{{ tuple "identity" "internal" "admin" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}>
+<VirtualHost *:{{ tuple "identity" "admin" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}>
    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
--- a/keystone/templates/job-db-sync.yaml
+++ b/keystone/templates/job-db-sync.yaml
@ -18,7 +18,7 @@ limitations under the License.
 {{- $envAll := index . 0 -}}
 env:
  - name: OS_BOOTSTRAP_ADMIN_URL
-    value: {{ tuple "identity" "admin" "admin" $envAll | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }}
+    value: {{ tuple "identity" "admin" "api" $envAll | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }}
  - name: OS_BOOTSTRAP_INTERNAL_URL
    value: {{ tuple "identity" "internal" "api" $envAll | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }}
  - name: OS_BOOTSTRAP_PUBLIC_URL
--- a/keystone/templates/service-api.yaml
+++ b/keystone/templates/service-api.yaml
@ -29,7 +29,7 @@ spec:
    nodePort: {{ .Values.network.api.node_port.port }}
    {{ end }}
  - name: ks-adm
-    port: {{ tuple "identity" "internal" "admin" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+    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 }}
--- a/keystone/values.yaml
+++ b/keystone/values.yaml
@ -930,10 +930,9 @@ endpoints:
    scheme:
      default: http
    port:
-      admin:
-        default: 35357
      api:
        default: 80
+        admin: 35357
  oslo_db:
    namespace: null
    auth:
--- a/magnum/values.yaml
+++ b/magnum/values.yaml
@ -362,10 +362,9 @@ endpoints:
    scheme:
      default: http
    port:
-      admin:
-        default: 35357
      api:
        default: 80
+        admin: 35357
  container_infra:
    name: magnum
    hosts:
--- a/mistral/values.yaml
+++ b/mistral/values.yaml
@ -245,10 +245,9 @@ endpoints:
    scheme:
      default: http
    port:
-      admin:
-        default: 35357
      api:
        default: 80
+        admin: 35357
  workflowv2:
    name: mistral
    hosts:
--- a/neutron/values.yaml
+++ b/neutron/values.yaml
@ -1780,10 +1780,9 @@ endpoints:
    scheme:
      default: http
    port:
-      admin:
-        default: 35357
      api:
        default: 80
+        admin: 35357
  network:
    name: neutron
    hosts:
--- a/nova/values.yaml
+++ b/nova/values.yaml
@ -1397,10 +1397,9 @@ endpoints:
    scheme:
      default: http
    port:
-      admin:
-        default: 35357
      api:
        default: 80
+        admin: 35357
  image:
    name: glance
    hosts:
--- a/rally/values.yaml
+++ b/rally/values.yaml
@ -258,10 +258,9 @@ endpoints:
    scheme:
      default: http
    port:
-      admin:
-        default: 35357
      api:
        default: 80
+        admin: 35357
  benchmark:
    name: rally
    hosts:
--- a/senlin/values.yaml
+++ b/senlin/values.yaml
@ -411,10 +411,9 @@ endpoints:
    scheme:
      default: http
    port:
-      admin:
-        default: 35357
      api:
        default: 80
+        admin: 35357
  clustering:
    name: senlin
    hosts:
--- a/tempest/values.yaml
+++ b/tempest/values.yaml
@ -253,10 +253,9 @@ endpoints:
    scheme:
      default: http
    port:
-      admin:
-        default: 35357
      api:
        default: 80
+        admin: 35357

 manifests:
  configmap_bin: true