From ec2f9d0808fe2f94487b511e75e5cd3a74c86f02 Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Wed, 25 Jul 2018 09:51:37 -0500
Subject: [PATCH] Keystone: Update admin port declaration to use standard
 layout

This PS updates keystone, and the keystone endpoints sections to use
the same layout for port declarations as other charts.

Change-Id: I7dddabee6c74bf023da4b1cdf722a409e7475f8f
Signed-off-by: Pete Birley <pete@port.direct>
---
 barbican/values.yaml                           | 3 +--
 ceilometer/values.yaml                         | 3 +--
 ceph-client/values.yaml                        | 3 +--
 cinder/values.yaml                             | 3 +--
 congress/values.yaml                           | 3 +--
 glance/values.yaml                             | 3 +--
 gnocchi/values.yaml                            | 3 +--
 heat/values.yaml                               | 3 +--
 horizon/values.yaml                            | 3 +--
 ironic/values.yaml                             | 3 +--
 keystone/templates/deployment-api.yaml         | 2 +-
 keystone/templates/etc/_wsgi-keystone.conf.tpl | 4 ++--
 keystone/templates/job-db-sync.yaml            | 2 +-
 keystone/templates/service-api.yaml            | 2 +-
 keystone/values.yaml                           | 3 +--
 magnum/values.yaml                             | 3 +--
 mistral/values.yaml                            | 3 +--
 neutron/values.yaml                            | 3 +--
 nova/values.yaml                               | 3 +--
 rally/values.yaml                              | 3 +--
 senlin/values.yaml                             | 3 +--
 tempest/values.yaml                            | 3 +--
 22 files changed, 23 insertions(+), 41 deletions(-)

diff --git a/barbican/values.yaml b/barbican/values.yaml
index 5fc8ff8194..45415ddb0a 100644
--- 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:
diff --git a/ceilometer/values.yaml b/ceilometer/values.yaml
index 0289d12a06..63ac555aab 100644
--- 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:
diff --git a/ceph-client/values.yaml b/ceph-client/values.yaml
index e6f000c2a8..3173ebbf72 100644
--- 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
diff --git a/cinder/values.yaml b/cinder/values.yaml
index 63c9d71948..ce52fb9294 100644
--- 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:
diff --git a/congress/values.yaml b/congress/values.yaml
index e6f560b462..42341dd126 100644
--- 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:
diff --git a/glance/values.yaml b/glance/values.yaml
index 481143b302..d90939728a 100644
--- 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:
diff --git a/gnocchi/values.yaml b/gnocchi/values.yaml
index 37664d35d9..5bdf89545e 100644
--- 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:
diff --git a/heat/values.yaml b/heat/values.yaml
index 95095dd991..ad59b6a76e 100644
--- 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:
diff --git a/horizon/values.yaml b/horizon/values.yaml
index 8e9e41db86..4354b97fc3 100644
--- 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
diff --git a/ironic/values.yaml b/ironic/values.yaml
index 0a792c16ae..439d27c59e 100644
--- 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:
diff --git a/keystone/templates/deployment-api.yaml b/keystone/templates/deployment-api.yaml
index 86088d5dcb..b4825ec006 100644
--- 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
diff --git a/keystone/templates/etc/_wsgi-keystone.conf.tpl b/keystone/templates/etc/_wsgi-keystone.conf.tpl
index 96966e512f..12079808d8 100644
--- 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
diff --git a/keystone/templates/job-db-sync.yaml b/keystone/templates/job-db-sync.yaml
index de32a79cc1..be84f64134 100644
--- 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
diff --git a/keystone/templates/service-api.yaml b/keystone/templates/service-api.yaml
index 4cc3a7e0fb..3c0dbe9a6f 100644
--- 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 }}
diff --git a/keystone/values.yaml b/keystone/values.yaml
index 76eb9f32a3..d4b73a5b0e 100644
--- 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:
diff --git a/magnum/values.yaml b/magnum/values.yaml
index 774dc9f9e0..daa72ac0cd 100644
--- 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:
diff --git a/mistral/values.yaml b/mistral/values.yaml
index 736e3c415a..c3cca6cb2a 100644
--- 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:
diff --git a/neutron/values.yaml b/neutron/values.yaml
index e71980d365..8be13cadcf 100644
--- 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:
diff --git a/nova/values.yaml b/nova/values.yaml
index 49a4044c64..8c683c7776 100644
--- 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:
diff --git a/rally/values.yaml b/rally/values.yaml
index b6ea2af088..7fb3f54430 100644
--- 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:
diff --git a/senlin/values.yaml b/senlin/values.yaml
index 73f451dc2a..f6531a1d40 100644
--- 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:
diff --git a/tempest/values.yaml b/tempest/values.yaml
index 3e04a068e5..47d8b1b412 100644
--- 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