5:41 a.m.
Sandro Bonazzola has submitted this change and it was merged.
Change subject: packaging: osinfo: move sysprep defaults out of /etc
......................................................................
packaging: osinfo: move sysprep defaults out of /etc
when moved to using conf.d structure, there is no reason why storing
sysprep files in /etc as user can install his own osinfo config and
overwrite product defaults reference with his own.
this simplifies pushing product changes without the rpmsave/rpmnew hell
and enables support to understand site customization.
upgrade is comparing current install sysprep files and keep these that
are different from product default at existing location, creating osinfo
configuration for these.
the move to osinfo neglected the ability of user to specify different
setting for sysprep in database, we also fix that.
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1043206
Change-Id: I26a853c12ca091f340d6ebed2c10726462ec576a
Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com>
---
M ovirt-engine.spec.in
M packaging/conf/osinfo-defaults.properties
R packaging/conf/sysprep/sysprep.2k12x64
R packaging/conf/sysprep/sysprep.2k3
R packaging/conf/sysprep/sysprep.2k8
R packaging/conf/sysprep/sysprep.2k8x64
R packaging/conf/sysprep/sysprep.w7
R packaging/conf/sysprep/sysprep.w7x64
R packaging/conf/sysprep/sysprep.w8
R packaging/conf/sysprep/sysprep.w8x64
R packaging/conf/sysprep/sysprep.xp
M packaging/setup/ovirt_engine_setup/constants.py
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/options.py
A packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/legacy/__init__.py
A packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/legacy/osinfo.py
15 files changed, 223 insertions(+), 82 deletions(-)
Approvals:
Alon Bar-Lev: Verified
Sandro Bonazzola: Looks good to me, approved
Yedidyah Bar David: Looks good to me, but someone else must approve
--
To view, visit http://gerrit.ovirt.org/22384
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I26a853c12ca091f340d6ebed2c10726462ec576a
Gerrit-PatchSet: 6
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Barak Azulay <bazulay(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Itamar Heim <iheim(a)redhat.com>
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com>
Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com>
Gerrit-Reviewer: Yedidyah Bar David <didi(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server