diff --git a/contrail_provisioning/storage/storagefs/ceph_utils.py b/contrail_provisioning/storage/storagefs/ceph_utils.py
index 423f476b..fafff184 100644
--- a/contrail_provisioning/storage/storagefs/ceph_utils.py
+++ b/contrail_provisioning/storage/storagefs/ceph_utils.py
@@ -1851,6 +1851,8 @@ def create_and_apply_ceph_deploy_patch(self):
         ceph_dep_version = self.exec_locals('dpkg-query -W -f=\'${Version}\' ceph-deploy')
         if LooseVersion(ceph_dep_version) >= LooseVersion('1.5.0'):
             ceph_new_version = True
+        else:
+            ceph_new_version = False
         self.exec_locals('echo \"diff -Naur ceph_deploy/hosts/debian/mon/create.py ceph_deploy.new/hosts/debian/mon/create.py" \
                 > %s' %(CEPH_DEPLOY_PATCH_FILE))
         self.exec_locals('echo \"--- ceph_deploy/hosts/debian/mon/create.py      2013-10-07 11:50:13.000000000 -0700" \
diff --git a/contrail_provisioning/storage/storagefs/setup.py b/contrail_provisioning/storage/storagefs/setup.py
index 57f9faaf..7dc1628c 100755
--- a/contrail_provisioning/storage/storagefs/setup.py
+++ b/contrail_provisioning/storage/storagefs/setup.py
@@ -2015,6 +2015,8 @@ def do_configure_ceph_object_storage(self):
                 if os_entry == entry:
                     storage_os_hostnames.append(hostname)
                     break
+        if storage_os_hostnames == []:
+            storage_os_hostnames.append('none')
         new_apache = 0
         apache_ver = local('dpkg-query -W -f=\'${Version}\' apache2',
                             capture=True)