Skip to content

Commit

Permalink
storage: avoid connecting to the storage pool to check its name
Browse files Browse the repository at this point in the history
Since 3.6.1 the hosted engine storage domain get imported
into the engine and attached to the storage pool of the
data-center that contains the hosted-engine hosts.
hosted-engine-setup on additional hosts was connecting the
bootstrap storage pool just to check its name but now it
cannot anymore since the master storage domain of the
datacenter storage pool could be a regular storage domain
on a storage server that hosted-engine-setup didn't
connected at all.
Avoid it and simply rely on the name in the answerfile gathered
from the first host.

Change-Id: I912eb3bdd69567e1902ab28f71ce16496b4e9bb3
Bug-Url: https://bugzilla.redhat.com/1293892
Signed-off-by: Simone Tiraboschi <stirabos@redhat.com>
  • Loading branch information
tiraboschi committed Dec 23, 2015
1 parent e6f32fa commit d82d71b
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions src/plugins/ovirt-hosted-engine-setup/storage/storage.py
Original file line number Diff line number Diff line change
Expand Up @@ -513,12 +513,6 @@ def _getExistingDomain(self):
ohostedcons.StorageEnv.SP_UUID
] = spUUID
self._handleHostId()
if self.pool_exists:
pool_info = self._getStoragePoolInfo(spUUID)
if pool_info:
self.environment[
ohostedcons.StorageEnv.STORAGE_DATACENTER_NAME
] = pool_info['name']
elif self.storageType in (
ohostedcons.VDSMConstants.NFS_DOMAIN,
ohostedcons.VDSMConstants.GLUSTERFS_DOMAIN,
Expand Down Expand Up @@ -563,12 +557,6 @@ def _getExistingDomain(self):
self.environment[
ohostedcons.StorageEnv.SP_UUID
] = spUUID
self._storagePoolConnection()
pool_info = self._getStoragePoolInfo(spUUID)
if pool_info:
self.environment[
ohostedcons.StorageEnv.STORAGE_DATACENTER_NAME
] = pool_info['name']
break

if not self.domain_exists:
Expand Down

0 comments on commit d82d71b

Please sign in to comment.