Content differences:
--- /etc/magnum/magnum.conf.orig
+++ /etc/magnum/magnum.conf
@@ -202,6 +202,8 @@
#pre_delete_lb_timeout = 60
+
+
[cluster_heat]
#
# From magnum.conf
@@ -236,40 +238,6 @@
# OpenStack service. (string value)
region_name = eqiad1-r
-
-
-[cluster_template]
-
-#
-# From magnum.conf
-#
-
-# Allowed network drivers for kubernetes cluster-templates. Use 'all'
-# keyword to allow all drivers supported for kubernetes cluster-
-# templates. Supported network drivers include flannel. (list value)
-#kubernetes_allowed_network_drivers = all
-
-# Default network driver for kubernetes cluster-templates. (string
-# value)
-#kubernetes_default_network_driver = flannel
-
-# Allowed network drivers for docker swarm cluster-templates. Use
-# 'all' keyword to allow all drivers supported for swarm cluster-
-# templates. Supported network drivers include docker and flannel.
-# (list value)
-#swarm_allowed_network_drivers = all
-
-# Default network driver for docker swarm cluster-templates. (string
-# value)
-#swarm_default_network_driver = docker
-
-# Allowed network drivers for mesos cluster-templates. Use 'all'
-# keyword to allow all drivers supported for mesos cluster-templates.
-# Supported network drivers include docker. (list value)
-#mesos_allowed_network_drivers = all
-
-# Default network driver for mesos cluster-templates. (string value)
-#mesos_default_network_driver = docker
[conductor]