[Engine-patches] Change in ovirt-reports[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: I52c842bd319aa0a0f9f2031772e5213bc502a301
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M packaging/setup/ovirt_engine_setup/reportsconstants.py
M 
packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/distro-rpm/packages.py
2 files changed, 30 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/99/24599/1

diff --git a/packaging/setup/ovirt_engine_setup/reportsconstants.py 
b/packaging/setup/ovirt_engine_setup/reportsconstants.py
index 90c65bd..e23072a 100644
--- a/packaging/setup/ovirt_engine_setup/reportsconstants.py
+++ b/packaging/setup/ovirt_engine_setup/reportsconstants.py
@@ -313,6 +313,14 @@
 @util.export
 @util.codegen
 @osetupattrsclass
+class RPMDistroEnv(object):
+    PACKAGES = 'OVESETUP_REPORTS_RPMDISRO_PACKAGES'
+    PACKAGES_SETUP = 'OVESETUP_REPORTS_RPMDISRO_PACKAGES_SETUP'
+
+
+@util.export
+@util.codegen
+@osetupattrsclass
 class ApacheEnv(object):
     HTTPD_CONF_OVIRT_ENGINE_REPORTS = \
         'OVESETUP_REPORTS_APACHE/configFileOvirtEngineReports'
diff --git 
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/distro-rpm/packages.py
 
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/distro-rpm/packages.py
index a51dbac..954c8c6 100644
--- 
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/distro-rpm/packages.py
+++ 
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/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(
+            oreportscons.RPMDistroEnv.PACKAGES,
+            oreportscons.Const.OVIRT_ENGINE_REPORTS_PACKAGE_NAME
+        )
+        self.environment.setdefault(
+            oreportscons.RPMDistroEnv.PACKAGES_SETUP,
+            oreportscons.Const.OVIRT_ENGINE_REPORTS_SETUP_PACKAGE_NAME
+        )
+
+    @plugin.event(
         stage=plugin.Stages.STAGE_CUSTOMIZATION,
         after=(
             oreportscons.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(
-            oreportscons.Const.OVIRT_ENGINE_REPORTS_SETUP_PACKAGE_NAME,
+        ].extend(
+            tolist(self.environment[oreportscons.RPMDistroEnv.PACKAGES_SETUP])
         )
 
         if self.environment[oreportscons.CoreEnv.ENABLE]:
@@ -62,8 +78,10 @@
                 osetupcons.RPMDistroEnv.PACKAGES_UPGRADE_LIST
             ].append(
                 {
-                    'packages': (
-                        oreportscons.Const.OVIRT_ENGINE_REPORTS_PACKAGE_NAME,
+                    'packages': tolist(
+                        self.environment[
+                            oreportscons.RPMDistroEnv.PACKAGES
+                        ]
                     ),
                 },
             )


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I52c842bd319aa0a0f9f2031772e5213bc502a301
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-reports
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