Change-Id: I27fc91597b0fdb9789844e1917eee5ada352d22d
Conflicts: magnum/drivers/heat/k8s_fedora_template_def.py magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml
Conflicts: magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml