From 9de21d616554e8d256c653a9edfcc4df79e61d43 Mon Sep 17 00:00:00 2001
From: Volker Theile <vtheile@suse.com>
Date: Thu, 3 Jan 2019 14:58:55 +0100
Subject: [PATCH] mgr/telemetry: Fix various issues

- Set module config type to ``str``, otherwise default values are ``'None'`` (str) instead of ``None`` which will cause ``init_module_config`` to fail.
- RuntimeError does not format strings.

Signed-off-by: Volker Theile <vtheile@suse.com>
---
 src/pybind/mgr/telemetry/module.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/pybind/mgr/telemetry/module.py b/src/pybind/mgr/telemetry/module.py
index ec045901f20..c37d999c62a 100644
--- a/src/pybind/mgr/telemetry/module.py
+++ b/src/pybind/mgr/telemetry/module.py
@@ -34,6 +34,7 @@ class Module(MgrModule):
     MODULE_OPTIONS = [
         {
             'name': 'url',
+            'type': 'str',
             'default': 'https://telemetry.ceph.com/report'
         },
         {
@@ -48,18 +49,22 @@ class Module(MgrModule):
         },
         {
             'name': 'description',
+            'type': 'str',
             'default': None
         },
         {
             'name': 'contact',
+            'type': 'str',
             'default': None
         },
         {
             'name': 'organization',
+            'type': 'str',
             'default': None
         },
         {
             'name': 'proxy',
+            'type': 'str',
             'default': None
         },
         {
@@ -131,7 +136,7 @@ class Module(MgrModule):
 
     def set_config_option(self, option, value):
         if option not in self.config_keys.keys():
-            raise RuntimeError('{0} is a unknown configuration '
+            raise RuntimeError('{} is a unknown configuration '
                                'option'.format(option))
 
         if option == 'interval':
@@ -149,13 +154,13 @@ class Module(MgrModule):
 
         if option == 'contact':
             if value and not self.is_valid_email(value):
-                raise RuntimeError('%s is not a valid e-mail address as a '
-                                   'contact', value)
+                raise RuntimeError('{} is not a valid e-mail address as a '
+                                   'contact'.format(value))
 
         if option in ['description', 'organization']:
             if value and len(value) > 256:
-                raise RuntimeError('%s should be limited to 256 '
-                                   'characters', option)
+                raise RuntimeError('{} should be limited to 256 '
+                                   'characters'.format(option))
 
         self.config[option] = value
         return True
-- 
2.39.5