Storage provision fix

Closes-Bug: #1602390 Closes-Bug: #1602384 Fixed issue in initializing version variable and openstack node variable, causing storage setup to abort. Change-Id: I84b2f4764208d524f774601ed3e6356357ac8280
Juniper · Jul 12, 2016 · 23187e3 · 23187e3
1 parent 09f5e4e
commit 23187e3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git 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
@@ -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)