From a6322a5521789145168126449fa77477b9a98ffd Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Thu, 3 May 2018 20:02:06 -0500
Subject: [PATCH] Magnum: basic chart enhancement

This ps provides several basic enhancements to the magnum chart.

Change-Id: I50bbb5f1db1490be6844970b2715fa05abb56ea2
---
 .../bin/_magnum-conductor-init.sh.tpl         | 24 ++++++++++
 magnum/templates/bin/_magnum-conductor.sh.tpl |  3 +-
 magnum/templates/configmap-bin.yaml           |  2 +
 magnum/templates/deployment-api.yaml          |  4 ++
 magnum/templates/statefulset-conductor.yaml   | 31 +++++++++++--
 magnum/values.yaml                            | 44 +++++++++++++++++++
 6 files changed, 104 insertions(+), 4 deletions(-)
 create mode 100644 magnum/templates/bin/_magnum-conductor-init.sh.tpl

diff --git a/magnum/templates/bin/_magnum-conductor-init.sh.tpl b/magnum/templates/bin/_magnum-conductor-init.sh.tpl
new file mode 100644
index 0000000000..0efbad9611
--- /dev/null
+++ b/magnum/templates/bin/_magnum-conductor-init.sh.tpl
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+{{/*
+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.
+*/}}
+
+set -ex
+
+tee /tmp/pod-shared/magnum.conf <<EOF
+[DEFAULT]
+host = ${POD_NAME}
+EOF
diff --git a/magnum/templates/bin/_magnum-conductor.sh.tpl b/magnum/templates/bin/_magnum-conductor.sh.tpl
index 4decd7ea36..cd46146ed3 100644
--- a/magnum/templates/bin/_magnum-conductor.sh.tpl
+++ b/magnum/templates/bin/_magnum-conductor.sh.tpl
@@ -18,4 +18,5 @@ limitations under the License.
 
 set -ex
 exec magnum-conductor \
-      --config-file /etc/magnum/magnum.conf
+      --config-file /etc/magnum/magnum.conf \
+      --config-file /tmp/pod-shared/magnum.conf
diff --git a/magnum/templates/configmap-bin.yaml b/magnum/templates/configmap-bin.yaml
index 82ff645405..fc48f0bd69 100644
--- a/magnum/templates/configmap-bin.yaml
+++ b/magnum/templates/configmap-bin.yaml
@@ -44,6 +44,8 @@ data:
 {{ tuple "bin/_magnum-api.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
   magnum-conductor.sh: |
 {{ tuple "bin/_magnum-conductor.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
+  magnum-conductor-init.sh: |
+{{ tuple "bin/_magnum-conductor-init.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
   rabbit-init.sh: |
 {{- include "helm-toolkit.scripts.rabbit_init" . | indent 4 }}
 {{- end }}
diff --git a/magnum/templates/deployment-api.yaml b/magnum/templates/deployment-api.yaml
index e6f77cb832..cf3a869c76 100644
--- a/magnum/templates/deployment-api.yaml
+++ b/magnum/templates/deployment-api.yaml
@@ -94,6 +94,8 @@ spec:
               mountPath: /etc/magnum/policy.json
               subPath: policy.json
               readOnly: true
+            - name: magnum-lock-path
+              mountPath: {{ .Values.conf.magnum.oslo_concurrency.lock_path }}
 {{ if $mounts_magnum_api.volumeMounts }}{{ toYaml $mounts_magnum_api.volumeMounts | indent 12 }}{{ end }}
       volumes:
         - name: pod-etc-magnum
@@ -108,5 +110,7 @@ spec:
           configMap:
             name: magnum-etc
             defaultMode: 0444
+        - name: magnum-lock-path
+          emptyDir: {}
 {{ if $mounts_magnum_api.volumes }}{{ toYaml $mounts_magnum_api.volumes | indent 8 }}{{ end }}
 {{- end }}
diff --git a/magnum/templates/statefulset-conductor.yaml b/magnum/templates/statefulset-conductor.yaml
index 4213ccb87b..c17e9d7931 100644
--- a/magnum/templates/statefulset-conductor.yaml
+++ b/magnum/templates/statefulset-conductor.yaml
@@ -30,6 +30,7 @@ metadata:
   name: magnum-conductor
 spec:
   serviceName: magnum-conductor
+  podManagementPolicy: "Parallel"
   replicas: {{ .Values.pod.replicas.conductor }}
   template:
     metadata:
@@ -43,6 +44,26 @@ spec:
         {{ .Values.labels.conductor.node_selector_key }}: {{ .Values.labels.conductor.node_selector_value }}
       initContainers:
 {{ tuple $envAll $dependencies $mounts_magnum_conductor_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
+        - name: magnum-conductor-init
+          image: {{ .Values.images.tags.magnum_conductor }}
+          imagePullPolicy: {{ .Values.images.pull_policy }}
+{{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+          securityContext:
+            runAsUser: {{ .Values.pod.user.magnum.uid }}
+          env:
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+          command:
+            - /tmp/magnum-conductor-init.sh
+          volumeMounts:
+            - name: magnum-bin
+              mountPath: /tmp/magnum-conductor-init.sh
+              subPath: magnum-conductor-init.sh
+              readOnly: true
+            - name: pod-shared
+              mountPath: /tmp/pod-shared
       containers:
         - name: magnum-conductor
           image: {{ .Values.images.tags.magnum_conductor }}
@@ -59,8 +80,6 @@ spec:
               readOnly: true
             - name: pod-etc-magnum
               mountPath: /etc/magnum
-            - name: pod-var-cache-magnum
-              mountPath: /var/cache/magnum
             - name: magnum-etc
               mountPath: /etc/magnum/magnum.conf
               subPath: magnum.conf
@@ -69,11 +88,15 @@ spec:
               mountPath: /etc/magnum/policy.json
               subPath: policy.json
               readOnly: true
+            - name: pod-shared
+              mountPath: /tmp/pod-shared
+            - name: magnum-lock-path
+              mountPath: {{ .Values.conf.magnum.oslo_concurrency.lock_path }}
 {{ if $mounts_magnum_conductor.volumeMounts }}{{ toYaml $mounts_magnum_conductor.volumeMounts | indent 12 }}{{ end }}
       volumes:
         - name: pod-etc-magnum
           emptyDir: {}
-        - name: pod-var-cache-magnum
+        - name: pod-shared
           emptyDir: {}
         - name: magnum-bin
           configMap:
@@ -83,5 +106,7 @@ spec:
           configMap:
             name: magnum-etc
             defaultMode: 0444
+        - name: magnum-lock-path
+          emptyDir: {}
 {{ if $mounts_magnum_conductor.volumes }}{{ toYaml $mounts_magnum_conductor.volumes | indent 8 }}{{ end }}
 {{- end }}
diff --git a/magnum/values.yaml b/magnum/values.yaml
index 2ada2ed7cb..e8cd5e1e5e 100644
--- a/magnum/values.yaml
+++ b/magnum/values.yaml
@@ -109,6 +109,12 @@ conf:
   magnum:
     DEFAULT:
       transport_url: null
+    oslo_messaging_notifications:
+      driver: messaging
+    oslo_concurrency:
+      lock_path: /var/lib/magnum/tmp
+    certificates:
+      cert_manager_type: barbican
     database:
       max_retries: -1
     trust:
@@ -159,6 +165,10 @@ dependencies:
           service: identity
         - endpoint: internal
           service: oslo_messaging
+        - endpoint: internal
+          service: key_manager
+        - endpoint: internal
+          service: orchestration
     conductor:
       jobs:
         - magnum-db-sync
@@ -173,6 +183,10 @@ dependencies:
           service: identity
         - endpoint: internal
           service: oslo_messaging
+        - endpoint: internal
+          service: key_manager
+        - endpoint: internal
+          service: orchestration
     db_drop:
       services:
         - endpoint: internal
@@ -276,6 +290,36 @@ endpoints:
       api:
         default: 9511
         public: 80
+  key_manager:
+    name: barbican
+    hosts:
+      default: barbican-api
+      public: barbican
+    host_fqdn_override:
+      default: null
+    path:
+      default: /v1
+    scheme:
+      default: http
+    port:
+      api:
+        default: 9311
+        public: 80
+  orchestration:
+    name: heat
+    hosts:
+      default: heat-api
+      public: heat
+    host_fqdn_override:
+      default: null
+    path:
+      default: '/v1/%(project_id)s'
+    scheme:
+      default: 'http'
+    port:
+      api:
+        default: 8004
+        public: 80
   oslo_db:
     auth:
       admin: