[Engine-patches] Change in ovirt-dwh[master]: packaging: setup: allow setting package names via environment

[Alon Bar-Lev]

Alon Bar-Lev has uploaded a new change for review.

Change subject: packaging: setup: allow setting package names via environment
......................................................................

packaging: setup: allow setting package names via environment

Change-Id: If18c481e824c3840c4f45f296af8aff63b83bdfe
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M packaging/setup/ovirt_engine_setup/dwhconstants.py
M 
packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/distro-rpm/packages.py
2 files changed, 30 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/66/25266/1

diff --git a/packaging/setup/ovirt_engine_setup/dwhconstants.py 
b/packaging/setup/ovirt_engine_setup/dwhconstants.py
index 8552655..ff17357 100644
--- a/packaging/setup/ovirt_engine_setup/dwhconstants.py
+++ b/packaging/setup/ovirt_engine_setup/dwhconstants.py
@@ -233,4 +233,12 @@
         return 'OVESETUP_DWH_PROVISIONING/postgresProvisioningEnabled'
 
 
+@util.export
+@util.codegen
+@osetupattrsclass
+class RPMDistroEnv(object):
+    PACKAGES = 'OVESETUP_DWH_RPMDISRO_PACKAGES'
+    PACKAGES_SETUP = 'OVESETUP_DWH_RPMDISRO_PACKAGES_SETUP'
+
+
 # vim: expandtab tabstop=4 shiftwidth=4
diff --git 
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/distro-rpm/packages.py
 
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/distro-rpm/packages.py
index 8dcdfb4..0c19bc2 100644
--- 
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/distro-rpm/packages.py
+++ 
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/distro-rpm/packages.py
@@ -42,6 +42,19 @@
         super(Plugin, self).__init__(context=context)
 
     @plugin.event(
+        stage=plugin.Stages.STAGE_INIT,
+    )
+    def _init(self):
+        self.environment.setdefault(
+            odwhcons.RPMDistroEnv.PACKAGES,
+            odwhcons.Const.OVIRT_ENGINE_DWH_PACKAGE_NAME
+        )
+        self.environment.setdefault(
+            odwhcons.RPMDistroEnv.PACKAGES_SETUP,
+            odwhcons.Const.OVIRT_ENGINE_DWH_SETUP_PACKAGE_NAME
+        )
+
+    @plugin.event(
         stage=plugin.Stages.STAGE_CUSTOMIZATION,
         after=(
             odwhcons.Stages.CORE_ENABLE,
@@ -51,10 +64,13 @@
         )
     )
     def _customization(self):
+        def tolist(s):
+            return [e.strip() for e in s.split(',')]
+
         self.environment[
             osetupcons.RPMDistroEnv.PACKAGES_SETUP
-        ].append(
-            odwhcons.Const.OVIRT_ENGINE_DWH_SETUP_PACKAGE_NAME,
+        ].extend(
+            tolist(self.environment[odwhcons.RPMDistroEnv.PACKAGES_SETUP])
         )
 
         if self.environment[odwhcons.CoreEnv.ENABLE]:
@@ -62,8 +78,10 @@
                 osetupcons.RPMDistroEnv.PACKAGES_UPGRADE_LIST
             ].append(
                 {
-                    'packages': (
-                        odwhcons.Const.OVIRT_ENGINE_DWH_PACKAGE_NAME,
+                    'packages': tolist(
+                        self.environment[
+                            odwhcons.RPMDistroEnv.PACKAGES
+                        ]
                     ),
                 },
             )


-- 
To view, visit http://gerrit.ovirt.org/25266
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If18c481e824c3840c4f45f296af8aff63b83bdfe
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-dwh
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches