Change in vdsm[master]: core: Remove substitutions from dumpStorageTable

dkuznets at redhat.com dkuznets at redhat.com
Sun Aug 16 09:43:05 UTC 2015


Dima Kuznetsov has uploaded a new change for review.

Change subject: core: Remove substitutions from dumpStorageTable
......................................................................

core: Remove substitutions from dumpStorageTable

This patch removes the use of substitutions from dumpStorageTable,
The required value is available in the config and retrieved from there.
Part of the effort to minimize generated files.

Change-Id: Id041a7caefe00ae85443cc1350506d0a75932028
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1098179
Signed-off-by: Dima Kuznetsov <dkuznets at redhat.com>
---
M vdsm/Makefile.am
R vdsm/dumpStorageTable.py
2 files changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/77/44877/1

diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am
index 4c0578e..23c5b4c 100644
--- a/vdsm/Makefile.am
+++ b/vdsm/Makefile.am
@@ -30,6 +30,7 @@
 	clientIF.py \
 	debugPluginClient.py \
 	dmidecodeUtil.py \
+	dumpStorageTable.py \
 	hooking.py \
 	hooks.py \
 	hostdev.py \
@@ -55,7 +56,7 @@
 
 nodist_vdsm_PYTHON = \
 	dsaversion.py \
-	dumpStorageTable.py
+	$(NULL)
 
 nodist_vdsm_SCRIPTS = \
 	mk_sysprep_floppy \
@@ -93,7 +94,6 @@
 EXTRA_DIST = \
 	bonding-defaults.json \
 	dsaversion.py.in \
-	dumpStorageTable.py.in \
 	libvirt_password \
 	limits.conf \
 	logger.conf.in \
diff --git a/vdsm/dumpStorageTable.py.in b/vdsm/dumpStorageTable.py
similarity index 98%
rename from vdsm/dumpStorageTable.py.in
rename to vdsm/dumpStorageTable.py
index 82920fd..18a0c8c 100644
--- a/vdsm/dumpStorageTable.py.in
+++ b/vdsm/dumpStorageTable.py
@@ -22,8 +22,10 @@
 import socket
 import traceback
 
+import vdsm.config
+
 BLANK_UUID = '00000000-0000-0000-0000-000000000000'
-DC = '@VDSMREPO@'
+DC = vdsm.config.get('irc', 'repository')
 MASTERSD_PATH = 'mastersd/master/vms'
 CDROM_IMAGE = '11111111-1111-1111-1111-111111111111'
 


-- 
To view, visit https://gerrit.ovirt.org/44877
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id041a7caefe00ae85443cc1350506d0a75932028
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dima Kuznetsov <dkuznets at redhat.com>


More information about the vdsm-patches mailing list