Mistral: remove oslo-genconfig

This PS removes the modified oslo-genconfig from mistral.

Partially implements: blueprint remove-pregenerated-config-templates

Change-Id: Iddcb0a90e761181867687e548d5e5daa1039d7c8

mistral/templates/configmap-etc.yaml

@@ -17,50 +17,48 @@ limitations under the License.
 {{- if .Values.manifests.configmap_etc }}
 {{- $envAll := . }}
 
-{{- include "mistral.conf.mistral_values_skeleton" .Values.conf.mistral | trunc 0 -}}
+{{- if empty .Values.conf.mistral.keystone_authtoken.auth_uri -}}
-
+{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.mistral.keystone_authtoken "auth_uri" | quote | trunc 0 -}}
-{{- if empty .Values.conf.mistral.keystone_authtoken.keystonemiddleware.auth_token.auth_uri -}}
-{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.mistral.keystone_authtoken.keystonemiddleware.auth_token "auth_uri" | quote | trunc 0 -}}
 {{- end -}}
 
-{{- if empty .Values.conf.mistral.keystone_authtoken.keystonemiddleware.auth_token.auth_url -}}
+{{- if empty .Values.conf.mistral.keystone_authtoken.auth_url -}}
-{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.mistral.keystone_authtoken.keystonemiddleware.auth_token "auth_url" | quote | trunc 0 -}}
+{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.mistral.keystone_authtoken "auth_url" | quote | trunc 0 -}}
 {{- end -}}
 
 # Set a random string as secret key.
-{{- if empty .Values.conf.mistral.keystone_authtoken.keystonemiddleware.auth_token.memcache_secret_key -}}
+{{- if empty .Values.conf.mistral.keystone_authtoken.memcache_secret_key -}}
-{{- randAlphaNum 64 | set .Values.conf.mistral.keystone_authtoken.keystonemiddleware.auth_token "memcache_secret_key" | quote | trunc 0 -}}
+{{- randAlphaNum 64 | set .Values.conf.mistral.keystone_authtoken "memcache_secret_key" | quote | trunc 0 -}}
 {{- end -}}
 
-{{- if empty .Values.conf.mistral.keystone_authtoken.keystonemiddleware.auth_token.region_name -}}
+{{- if empty .Values.conf.mistral.keystone_authtoken.region_name -}}
-{{- set .Values.conf.mistral.keystone_authtoken.keystonemiddleware.auth_token "region_name" .Values.endpoints.identity.auth.user.region_name | quote | trunc 0 -}}
+{{- set .Values.conf.mistral.keystone_authtoken "region_name" .Values.endpoints.identity.auth.user.region_name | quote | trunc 0 -}}
 {{- end -}}
-{{- if empty .Values.conf.mistral.keystone_authtoken.keystonemiddleware.auth_token.project_name -}}
+{{- if empty .Values.conf.mistral.keystone_authtoken.project_name -}}
-{{- set .Values.conf.mistral.keystone_authtoken.keystonemiddleware.auth_token "project_name" .Values.endpoints.identity.auth.user.project_name | quote | trunc 0 -}}
+{{- set .Values.conf.mistral.keystone_authtoken "project_name" .Values.endpoints.identity.auth.user.project_name | quote | trunc 0 -}}
 {{- end -}}
-{{- if empty .Values.conf.mistral.keystone_authtoken.keystonemiddleware.auth_token.project_domain_name -}}
+{{- if empty .Values.conf.mistral.keystone_authtoken.project_domain_name -}}
-{{- set .Values.conf.mistral.keystone_authtoken.keystonemiddleware.auth_token "project_domain_name" .Values.endpoints.identity.auth.user.project_domain_name | quote | trunc 0 -}}
+{{- set .Values.conf.mistral.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.user.project_domain_name | quote | trunc 0 -}}
 {{- end -}}
-{{- if empty .Values.conf.mistral.keystone_authtoken.keystonemiddleware.auth_token.user_domain_name -}}
+{{- if empty .Values.conf.mistral.keystone_authtoken.user_domain_name -}}
-{{- set .Values.conf.mistral.keystone_authtoken.keystonemiddleware.auth_token "user_domain_name" .Values.endpoints.identity.auth.user.user_domain_name | quote | trunc 0 -}}
+{{- set .Values.conf.mistral.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.user.user_domain_name | quote | trunc 0 -}}
 {{- end -}}
-{{- if empty .Values.conf.mistral.keystone_authtoken.keystonemiddleware.auth_token.username -}}
+{{- if empty .Values.conf.mistral.keystone_authtoken.username -}}
-{{- set .Values.conf.mistral.keystone_authtoken.keystonemiddleware.auth_token "username" .Values.endpoints.identity.auth.user.username | quote | trunc 0 -}}
+{{- set .Values.conf.mistral.keystone_authtoken "username" .Values.endpoints.identity.auth.user.username | quote | trunc 0 -}}
 {{- end -}}
-{{- if empty .Values.conf.mistral.keystone_authtoken.keystonemiddleware.auth_token.password -}}
+{{- if empty .Values.conf.mistral.keystone_authtoken.password -}}
-{{- set .Values.conf.mistral.keystone_authtoken.keystonemiddleware.auth_token "password" .Values.endpoints.identity.auth.user.password | quote | trunc 0 -}}
+{{- set .Values.conf.mistral.keystone_authtoken "password" .Values.endpoints.identity.auth.user.password | quote | trunc 0 -}}
 {{- end -}}
 
-{{- if empty .Values.conf.mistral.keystone_authtoken.keystonemiddleware.auth_token.memcached_servers -}}
+{{- if empty .Values.conf.mistral.keystone_authtoken.memcached_servers -}}
-{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.mistral.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.mistral.keystone_authtoken "memcached_servers" | quote | trunc 0 -}}
 {{- end -}}
 
-{{- if empty .Values.conf.mistral.database.oslo.db.connection -}}
+{{- if empty .Values.conf.mistral.database.connection -}}
-{{- tuple "oslo_db" "internal" "user" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.mistral.database.oslo.db "connection" | quote | trunc 0 -}}
+{{- tuple "oslo_db" "internal" "user" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.mistral.database "connection" | quote | trunc 0 -}}
 {{- end -}}
 
-{{- if empty .Values.conf.mistral.default.oslo.messaging.transport_url -}}
+{{- if empty .Values.conf.mistral.DEFAULT.transport_url -}}
-{{- tuple "oslo_messaging" "internal" "user" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.mistral.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.mistral.DEFAULT "transport_url" | quote | trunc 0 -}}
 {{- end -}}
 
 ---
@@ -70,7 +68,7 @@ metadata:
   name: mistral-etc
 data:
   mistral.conf: |+
-{{- tuple .Values.conf.mistral "etc/_mistral.conf.tpl" . | include "helm-toolkit.utils.configmap_templater" }}
+{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.mistral | indent 4 }}
   policy.json: |+
 {{  toJson .Values.conf.policy | indent 4 }}
 {{- end }}

mistral/templates/deployment-api.yaml

@@ -60,10 +60,10 @@ spec:
                   - stop
           ports:
             - name: {{ .Values.network.api.name }}
-              containerPort: {{ .Values.conf.mistral.api.mistral.config.port }}
+              containerPort: {{ .Values.conf.mistral.api.port }}
           readinessProbe:
             tcpSocket:
-              port: {{ .Values.conf.mistral.api.mistral.config.port }}
+              port: {{ .Values.conf.mistral.api.port }}
           volumeMounts:
             - name: pod-etc-mistral
               mountPath: /etc/mistral

mistral/templates/service-api.yaml

@@ -24,7 +24,7 @@ metadata:
 spec:
   ports:
     - name: w-api
-      port: {{ .Values.conf.mistral.api.mistral.config.port }}
+      port: {{ .Values.conf.mistral.api.port }}
     {{ if .Values.network.api.node_port.enabled }}
       nodePort: {{ .Values.network.api.node_port.port }}
     {{ end }}

mistral/values.yaml

@@ -274,30 +274,19 @@ conf:
     event_triggers:list: rule:admin_or_owner
     event_triggers:update: rule:admin_or_owner
   mistral:
-    override:
+    DEFAULT:
-    append:
+      transport_url: null
-    default:
-      mistral:
-        conf:
     api:
-      mistral:
+      port: 8989
-        config:
+      api_workers: 8
-          port: 8989
-          api_workers: 8
     coordination:
-      mistral:
+      backend_url:
-        config:
-          backend_url:
     database:
-      oslo:
+      max_retries: -1
-        db:
-          max_retries: -1
     keystone_authtoken:
-      keystonemiddleware:
+      auth_type: password
-        auth_token:
+      auth_version: v3
-          auth_type: password
+      memcache_security_strategy: ENCRYPT
-          auth_version: v3
-          memcache_security_strategy: ENCRYPT
 
 pod:
   user: