Cinder: remove oslo-genconfig

This PS removes the modified oslo-genconfig from cinder.

Partially implements: blueprint remove-pregenerated-config-templates

Change-Id: Id027319e96cecbeadb332c401955ec0ebc5eda16

cinder/templates/_funcs.tpl

@@ -25,7 +25,7 @@ true
 {{- end -}}
 
 {{- define "cinder.is_ceph_backup_configured" -}}
-{{- $values := .Values.conf.cinder.default.cinder -}}
+{{- $values := .Values.conf.cinder.DEFAULT -}}
 {{- if eq $values.backup_driver "cinder.backup.drivers.ceph" -}}
 true
 {{- end -}}

cinder/templates/configmap-etc.yaml

@@ -17,55 +17,52 @@ limitations under the License.
 {{- if .Values.manifests.configmap_etc }}
 {{- $envAll := . }}
 
-{{- include "cinder.conf.cinder_values_skeleton" .Values.conf.cinder | trunc 0 -}}
+{{- if empty .Values.conf.cinder.keystone_authtoken.auth_uri -}}
-
+{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.cinder.keystone_authtoken "auth_uri" | quote | trunc 0 -}}
-{{- if empty .Values.conf.cinder.keystone_authtoken.keystonemiddleware.auth_token.auth_uri -}}
-{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.cinder.keystone_authtoken.keystonemiddleware.auth_token "auth_uri" | quote | trunc 0 -}}
 {{- end -}}
 
-# FIXME(alanmeadows) fix for broken keystonemiddleware oslo config gen in newton - will remove in future
+{{- if empty .Values.conf.cinder.keystone_authtoken.auth_url -}}
-{{- if empty .Values.conf.cinder.keystone_authtoken.keystonemiddleware.auth_token.auth_url -}}
+{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.cinder.keystone_authtoken "auth_url" | quote | trunc 0 -}}
-{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.cinder.keystone_authtoken.keystonemiddleware.auth_token "auth_url" | quote | trunc 0 -}}
 {{- end -}}
 
 # Set a random string as secret key.
-{{- if empty .Values.conf.cinder.keystone_authtoken.keystonemiddleware.auth_token.memcache_secret_key -}}
+{{- if empty .Values.conf.cinder.keystone_authtoken.memcache_secret_key -}}
-{{- randAlphaNum 64 | set .Values.conf.cinder.keystone_authtoken.keystonemiddleware.auth_token "memcache_secret_key" | quote | trunc 0 -}}
+{{- randAlphaNum 64 | set .Values.conf.cinder.keystone_authtoken "memcache_secret_key" | quote | trunc 0 -}}
 {{- end -}}
 
-{{- if empty .Values.conf.cinder.keystone_authtoken.keystonemiddleware.auth_token.region_name -}}
+{{- if empty .Values.conf.cinder.keystone_authtoken.region_name -}}
-{{- set .Values.conf.cinder.keystone_authtoken.keystonemiddleware.auth_token "region_name" .Values.endpoints.identity.auth.user.region_name | quote | trunc 0 -}}
+{{- set .Values.conf.cinder.keystone_authtoken "region_name" .Values.endpoints.identity.auth.user.region_name | quote | trunc 0 -}}
 {{- end -}}
-{{- if empty .Values.conf.cinder.keystone_authtoken.keystonemiddleware.auth_token.project_name -}}
+{{- if empty .Values.conf.cinder.keystone_authtoken.project_name -}}
-{{- set .Values.conf.cinder.keystone_authtoken.keystonemiddleware.auth_token "project_name" .Values.endpoints.identity.auth.user.project_name | quote | trunc 0 -}}
+{{- set .Values.conf.cinder.keystone_authtoken "project_name" .Values.endpoints.identity.auth.user.project_name | quote | trunc 0 -}}
 {{- end -}}
-{{- if empty .Values.conf.cinder.keystone_authtoken.keystonemiddleware.auth_token.project_domain_name -}}
+{{- if empty .Values.conf.cinder.keystone_authtoken.project_domain_name -}}
-{{- set .Values.conf.cinder.keystone_authtoken.keystonemiddleware.auth_token "project_domain_name" .Values.endpoints.identity.auth.user.project_domain_name | quote | trunc 0 -}}
+{{- set .Values.conf.cinder.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.user.project_domain_name | quote | trunc 0 -}}
 {{- end -}}
-{{- if empty .Values.conf.cinder.keystone_authtoken.keystonemiddleware.auth_token.user_domain_name -}}
+{{- if empty .Values.conf.cinder.keystone_authtoken.user_domain_name -}}
-{{- set .Values.conf.cinder.keystone_authtoken.keystonemiddleware.auth_token "user_domain_name" .Values.endpoints.identity.auth.user.user_domain_name | quote | trunc 0 -}}
+{{- set .Values.conf.cinder.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.user.user_domain_name | quote | trunc 0 -}}
 {{- end -}}
-{{- if empty .Values.conf.cinder.keystone_authtoken.keystonemiddleware.auth_token.username -}}
+{{- if empty .Values.conf.cinder.keystone_authtoken.username -}}
-{{- set .Values.conf.cinder.keystone_authtoken.keystonemiddleware.auth_token "username" .Values.endpoints.identity.auth.user.username | quote | trunc 0 -}}
+{{- set .Values.conf.cinder.keystone_authtoken "username" .Values.endpoints.identity.auth.user.username | quote | trunc 0 -}}
 {{- end -}}
-{{- if empty .Values.conf.cinder.keystone_authtoken.keystonemiddleware.auth_token.password -}}
+{{- if empty .Values.conf.cinder.keystone_authtoken.password -}}
-{{- set .Values.conf.cinder.keystone_authtoken.keystonemiddleware.auth_token "password" .Values.endpoints.identity.auth.user.password | quote | trunc 0 -}}
+{{- set .Values.conf.cinder.keystone_authtoken "password" .Values.endpoints.identity.auth.user.password | quote | trunc 0 -}}
 {{- end -}}
 
-{{- if empty .Values.conf.cinder.keystone_authtoken.keystonemiddleware.auth_token.memcached_servers -}}
+{{- if empty .Values.conf.cinder.keystone_authtoken.memcached_servers -}}
-{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.cinder.keystone_authtoken.keystonemiddleware.auth_token "memcached_servers" | quote | trunc 0 -}}
+{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.cinder.keystone_authtoken "memcached_servers" | quote | trunc 0 -}}
 {{- end -}}
 
-{{- if empty .Values.conf.cinder.database.oslo.db.connection -}}
+{{- if empty .Values.conf.cinder.database.connection -}}
-{{- tuple "oslo_db" "internal" "user" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.cinder.database.oslo.db "connection" | quote | trunc 0 -}}
+{{- tuple "oslo_db" "internal" "user" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.cinder.database "connection" | quote | trunc 0 -}}
 {{- end -}}
 
-{{- if empty .Values.conf.cinder.default.oslo.messaging.transport_url -}}
+{{- if empty .Values.conf.cinder.DEFAULT.transport_url -}}
-{{- tuple "oslo_messaging" "internal" "user" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.cinder.default.oslo.messaging "transport_url" | quote | trunc 0 -}}
+{{- tuple "oslo_messaging" "internal" "user" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.cinder.DEFAULT "transport_url" | quote | trunc 0 -}}
 {{- end -}}
 
-{{- if empty .Values.conf.cinder.default.cinder.glance_api_servers -}}
+{{- if empty .Values.conf.cinder.DEFAULT.glance_api_servers -}}
-{{- tuple "image" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.cinder.default.cinder "glance_api_servers" | quote | trunc 0 -}}
+{{- tuple "image" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.cinder.DEFAULT "glance_api_servers" | quote | trunc 0 -}}
 {{- end -}}
 
 ---
@@ -77,21 +74,11 @@ data:
   rally_tests.yaml: |+
 {{- tuple .Values.conf.rally_tests "etc/_rally_tests.yaml.tpl" . | include "helm-toolkit.utils.configmap_templater" }}
   cinder.conf: |+
-{{- tuple .Values.conf.cinder "etc/_cinder.conf.tpl" . | include "helm-toolkit.utils.configmap_templater" }}
+{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.cinder | indent 4 }}
   backends.conf: |+
-{{ if .Values.conf.backends.override -}}
-{{ .Values.conf.backends.override | indent 4 }}
-{{- else -}}
-{{- if .Values.conf.backends.prefix -}}
-{{ .Values.conf.backends.prefix | indent 4 }}
-{{- end }}
 {{ include "helm-toolkit.utils.to_ini" .Values.conf.backends | indent 4 }}
-{{- end }}
-{{- if .Values.conf.backends.append -}}
-{{ .Values.conf.backends.append | indent 4 }}
-{{- end }}
   api-paste.ini: |+
-{{- tuple .Values.conf.paste "etc/_api-paste.ini.tpl" . | include "helm-toolkit.utils.configmap_templater" }}
+{{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }}
   policy.json: |+
 {{ toJson .Values.conf.policy | indent 4 }}
   cinder_sudoers: |+

cinder/templates/deployment-api.yaml

@@ -60,10 +60,10 @@ spec:
                   - stop
           ports:
             - name: c-api
-              containerPort: {{ .Values.conf.cinder.default.cinder.osapi_volume_listen_port }}
+              containerPort: {{ .Values.conf.cinder.DEFAULT.osapi_volume_listen_port }}
           readinessProbe:
             tcpSocket:
-              port: {{ .Values.conf.cinder.default.cinder.osapi_volume_listen_port }}
+              port: {{ .Values.conf.cinder.DEFAULT.osapi_volume_listen_port }}
           volumeMounts:
             - name: cinder-bin
               mountPath: /tmp/cinder-api.sh

cinder/templates/deployment-backup.yaml

@@ -79,7 +79,7 @@ spec:
               mountPath: /etc/cinder/cinder.conf
               subPath: cinder.conf
               readOnly: true
-            {{- if eq .Values.conf.cinder.default.cinder.backup_driver "cinder.backup.drivers.ceph" }}
+            {{- if eq .Values.conf.cinder.DEFAULT.backup_driver "cinder.backup.drivers.ceph" }}
             - name: etcceph
               mountPath: /etc/ceph
             - name: ceph-etc

cinder/templates/etc/_api-paste.ini.tpl

@@ -1,89 +0,0 @@
-# Copyright 2017 The Openstack-Helm Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-#############
-# OpenStack #
-#############
-
-[composite:osapi_volume]
-use = call:cinder.api:root_app_factory
-/: apiversions
-/v1: openstack_volume_api_v1
-/v2: openstack_volume_api_v2
-/v3: openstack_volume_api_v3
-
-[composite:openstack_volume_api_v1]
-use = call:cinder.api.middleware.auth:pipeline_factory
-noauth = cors http_proxy_to_wsgi request_id faultwrap sizelimit osprofiler noauth apiv1
-keystone = cors http_proxy_to_wsgi request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv1
-keystone_nolimit = cors http_proxy_to_wsgi request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv1
-
-[composite:openstack_volume_api_v2]
-use = call:cinder.api.middleware.auth:pipeline_factory
-noauth = cors http_proxy_to_wsgi request_id faultwrap sizelimit osprofiler noauth apiv2
-keystone = cors http_proxy_to_wsgi request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv2
-keystone_nolimit = cors http_proxy_to_wsgi request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv2
-
-[composite:openstack_volume_api_v3]
-use = call:cinder.api.middleware.auth:pipeline_factory
-noauth = cors http_proxy_to_wsgi request_id faultwrap sizelimit osprofiler noauth apiv3
-keystone = cors http_proxy_to_wsgi request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv3
-keystone_nolimit = cors http_proxy_to_wsgi request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv3
-
-[filter:request_id]
-paste.filter_factory = oslo_middleware.request_id:RequestId.factory
-
-[filter:http_proxy_to_wsgi]
-paste.filter_factory = oslo_middleware.http_proxy_to_wsgi:HTTPProxyToWSGI.factory
-
-[filter:cors]
-paste.filter_factory = oslo_middleware.cors:filter_factory
-oslo_config_project = cinder
-
-[filter:faultwrap]
-paste.filter_factory = cinder.api.middleware.fault:FaultWrapper.factory
-
-[filter:osprofiler]
-paste.filter_factory = osprofiler.web:WsgiMiddleware.factory
-
-[filter:noauth]
-paste.filter_factory = cinder.api.middleware.auth:NoAuthMiddleware.factory
-
-[filter:sizelimit]
-paste.filter_factory = oslo_middleware.sizelimit:RequestBodySizeLimiter.factory
-
-[app:apiv1]
-paste.app_factory = cinder.api.v1.router:APIRouter.factory
-
-[app:apiv2]
-paste.app_factory = cinder.api.v2.router:APIRouter.factory
-
-[app:apiv3]
-paste.app_factory = cinder.api.v3.router:APIRouter.factory
-
-[pipeline:apiversions]
-pipeline = cors http_proxy_to_wsgi faultwrap osvolumeversionapp
-
-[app:osvolumeversionapp]
-paste.app_factory = cinder.api.versions:Versions.factory
-
-##########
-# Shared #
-##########
-
-[filter:keystonecontext]
-paste.filter_factory = cinder.api.middleware.auth:CinderKeystoneContext.factory
-
-[filter:authtoken]
-paste.filter_factory = keystonemiddleware.auth_token:filter_factory

cinder/templates/service-api.yaml

@@ -24,7 +24,7 @@ metadata:
 spec:
   ports:
     - name: c-api
-      port: {{ .Values.conf.cinder.default.cinder.osapi_volume_listen_port }}
+      port: {{ .Values.conf.cinder.DEFAULT.osapi_volume_listen_port }}
     {{ if .Values.network.api.node_port.enabled }}
       nodePort: {{ .Values.network.api.node_port.port }}
     {{ end }}

cinder/values.yaml

@@ -177,8 +177,56 @@ network:
 
 conf:
   paste:
-    override:
+    composite:osapi_volume:
-    append:
+      use: call:cinder.api:root_app_factory
+      /: apiversions
+      /v1: openstack_volume_api_v1
+      /v2: openstack_volume_api_v2
+      /v3: openstack_volume_api_v3
+    composite:openstack_volume_api_v1:
+      use: call:cinder.api.middleware.auth:pipeline_factory
+      noauth: cors http_proxy_to_wsgi request_id faultwrap sizelimit osprofiler noauth apiv1
+      keystone: cors http_proxy_to_wsgi request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv1
+      keystone_nolimit: cors http_proxy_to_wsgi request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv1
+    composite:openstack_volume_api_v2:
+      use: call:cinder.api.middleware.auth:pipeline_factory
+      noauth: cors http_proxy_to_wsgi request_id faultwrap sizelimit osprofiler noauth apiv2
+      keystone: cors http_proxy_to_wsgi request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv2
+      keystone_nolimit: cors http_proxy_to_wsgi request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv2
+    composite:openstack_volume_api_v3:
+      use: call:cinder.api.middleware.auth:pipeline_factory
+      noauth: cors http_proxy_to_wsgi request_id faultwrap sizelimit osprofiler noauth apiv3
+      keystone: cors http_proxy_to_wsgi request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv3
+      keystone_nolimit: cors http_proxy_to_wsgi request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv3
+    filter:request_id:
+      paste.filter_factory: oslo_middleware.request_id:RequestId.factory
+    filter:http_proxy_to_wsgi:
+      paste.filter_factory: oslo_middleware.http_proxy_to_wsgi:HTTPProxyToWSGI.factory
+    filter:cors:
+      paste.filter_factory: oslo_middleware.cors:filter_factory
+      oslo_config_project: cinder
+    filter:faultwrap:
+      paste.filter_factory: cinder.api.middleware.fault:FaultWrapper.factory
+    filter:osprofiler:
+      paste.filter_factory: osprofiler.web:WsgiMiddleware.factory
+    filter:noauth:
+      paste.filter_factory: cinder.api.middleware.auth:NoAuthMiddleware.factory
+    filter:sizelimit:
+      paste.filter_factory: oslo_middleware.sizelimit:RequestBodySizeLimiter.factory
+    app:apiv1:
+      paste.app_factory: cinder.api.v1.router:APIRouter.factory
+    app:apiv2:
+      paste.app_factory: cinder.api.v2.router:APIRouter.factory
+    app:apiv3:
+      paste.app_factory: cinder.api.v3.router:APIRouter.factory
+    pipeline:apiversions:
+      pipeline: cors http_proxy_to_wsgi faultwrap osvolumeversionapp
+    app:osvolumeversionapp:
+      paste.app_factory: cinder.api.versions:Versions.factory
+    filter:keystonecontext:
+      paste.filter_factory: cinder.api.middleware.auth:CinderKeystoneContext.factory
+    filter:authtoken:
+      paste.filter_factory: keystonemiddleware.auth_token:filter_factory
   policy:
     context_is_admin: role:admin
     admin_or_owner: is_admin:True or project_id:%(project_id)s
@@ -311,18 +359,9 @@ conf:
     monitors: []
     cinder_keyring: null
   cinder:
-    override:
+    DEFAULT:
-    append:
-    database:
-      oslo:
-        db:
-          max_retries: -1
-    default:
-      oslo:
-        log:
       use_syslog: false
       use_stderr: true
-      cinder:
       enable_v1_api: false
       volume_name_template: "%s"
       osapi_volume_workers: 8
@@ -335,19 +374,15 @@ conf:
       backup_ceph_conf: "/etc/ceph/ceph.conf"
       backup_ceph_user: admin
       backup_ceph_pool: backups
+    database:
+      max_retries: -1
     keystone_authtoken:
-      keystonemiddleware:
-        auth_token:
       auth_version: v3
       auth_type: password
       memcache_security_strategy: ENCRYPT
     oslo_concurrency:
-      oslo:
-        concurrency:
       lock_path: "/var/lib/cinder/tmp"
   backends:
-    override:
-    append:
     # Those options will be written to backends.conf as-is.
     rbd1:
       volume_driver: cinder.volume.drivers.rbd.RBDDriver

tools/overrides/mvp/cinder.yaml

@@ -21,11 +21,7 @@ storage: "gate"
 
 conf:
   cinder:
-    default:
+    DEFAULT:
-      oslo:
-        log:
-          debug: false
-      cinder:
       backup_driver: "cinder.backup.drivers.nfs"
   backends:
     rbd1: