From 967d4b7a94f7716b4329510309baca3309c2f8f1 Mon Sep 17 00:00:00 2001
From: Mike Wilson <knobby@burntsheep.com>
Date: Thu, 16 Aug 2018 14:59:00 -0400
Subject: [PATCH] Changing ceph details to a dictionary. Original code would
 actually explode if ceph didn't exist :-/

---
 .../reactive/kubernetes_master.py             | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
index 00654934eff..91e49cf68cb 100644
--- a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
+++ b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
@@ -683,12 +683,14 @@ def configure_cdk_addons():
         cephEnabled = "true"
     else:
         cephEnabled = "false"
-    ceph = endpoint_from_flag('ceph-storage.available')
-    if ceph:
-        b64_ceph_key = base64.b64encode(ceph.key().encode('utf-8'))
-        ceph_admin_key = b64_ceph_key.decode('ascii')
-        ceph_kubernetes_key = b64_ceph_key.decode('ascii')
-        ceph_mon_hosts = ceph.mon_hosts()
+    ceph_ep = endpoint_from_flag('ceph-storage.available')
+    ceph = {}
+    default_storage = ''
+    if ceph_ep:
+        b64_ceph_key = base64.b64encode(ceph_ep.key().encode('utf-8'))
+        ceph['admin_key'] = b64_ceph_key.decode('ascii')
+        ceph['kubernetes_key'] = b64_ceph_key.decode('ascii')
+        ceph['mon_hosts'] = ceph_ep.mon_hosts()
         default_storage = hookenv.config('default-storage')
 
     args = [
@@ -700,10 +702,10 @@ def configure_cdk_addons():
         'enable-metrics=' + metricsEnabled,
         'enable-gpu=' + str(gpuEnable).lower(),
         'enable-ceph=' + cephEnabled,
-        'ceph-admin-key=' + (ceph_admin_key or ''),
-        'ceph-kubernetes-key=' + (ceph_admin_key or ''),
-        'ceph-mon-hosts="' + (ceph_mon_hosts or '') + '"',
-        'default-storage=' + (default_storage or ''),
+        'ceph-admin-key=' + (ceph.get('admin_key', '')),
+        'ceph-kubernetes-key=' + (ceph.get('admin_key', '')),
+        'ceph-mon-hosts="' + (ceph.get('mon_hosts', '')) + '"',
+        'default-storage=' + default_storage,
     ]
     check_call(['snap', 'set', 'cdk-addons'] + args)
     if not addons_ready():