diff --git a/lib/ceilometer_utils.py b/lib/ceilometer_utils.py
index 8c659cd..c4aa3d5 100644
--- a/lib/ceilometer_utils.py
+++ b/lib/ceilometer_utils.py
@@ -199,10 +199,14 @@ def register_configs():
     # just default to earliest supported release. configs dont get touched
     # till post-install, anyway.
 
-    release = (get_os_codename_package('ceilometer-common', fatal=False) or
-               'grizzly')
+    release = get_os_codename_package('ceilometer-common', fatal=False)
     configs = templating.OSConfigRenderer(templates_dir=TEMPLATES,
                                           openstack_release=release)
+    if not release:
+        log("Not installed yet, no way to determine the OS release. "
+            "Skipping register configs", DEBUG)
+        return configs
+
     if CompareOpenStackReleases(release) >= 'queens':
         for conf in QUEENS_CONFIG_FILES:
             configs.register(conf, QUEENS_CONFIG_FILES[conf]['hook_contexts'])
diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index 80ebc8b..43ebc87 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -141,7 +141,7 @@ class CeilometerBasicDeployment(OpenStackAmuletDeployment):
         }
         if self._get_openstack_release() >= self.xenial_pike:
             configs['ceph-osd'] = {'osd-devices': '/dev/vdb',
-                                   'osd-reformat': 'yes',
+                                   'osd-reformat': True,
                                    'ephemeral-unmount': '/mnt'}
         super(CeilometerBasicDeployment, self)._configure_services(configs)