Merge "Add a secret for magnum"

devstack/lib/magnum

@@ -255,8 +255,10 @@ function create_magnum_cache_dir {
 
 # init_magnum() - Initialize databases, etc.
 function init_magnum {
+	kubectl create secret generic magnum-config --from-file=/etc/magnum/magnum.conf --from-file=/etc/magnum/api-paste.ini -n openstack
+
     # NOTE: Permissions here are bad but it's temporary so we don't care as much.
-	sudo chmod -Rv 777 /etc/heat
+	sudo chmod -Rv 777 /etc/magnum
     # Only do this step once on the API node for an entire cluster.
     if is_service_enabled $DATABASE_BACKENDS; then
         # (Re)create magnum database

openstack_operator/templates/magnum/deployment.yml.j2

@@ -95,9 +95,8 @@ spec:
           mountPath: /etc/uwsgi
       volumes:
       - name: config
-        hostPath:
-          path: {{ spec['configDir'] }}
-          type: Directory
+        secret:
+          secretName: magnum-config
       - name: uwsgi-config
         configMap:
           defaultMode: 420