Alon Bar-Lev has uploaded a new change for review.
Change subject: packaging: move
/etc/ovirt-engine/ovirt-engine-dwh->/etc/ovirt-engine-dwh
......................................................................
packaging: move /etc/ovirt-engine/ovirt-engine-dwh->/etc/ovirt-engine-dwh
no sense to spread at both /etc/ovirt-engine/ and /etc/ovirt-engine-dwh
Change-Id: I7dd02f65532336152f81f73104112e0a8e5333a7
Signed-off-by: Alon Bar-Lev <alon.bar...@gmail.com>
---
M Makefile
M
data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/historyetl_3_3/HistoryETL.java
M data-warehouse/history_etl/etl_sources/packaging/pom.xml
M data-warehouse/history_etl/etl_sources/packaging/root_etl_deploy.sh
M data-warehouse/history_etl/tos_project/process/HistoryETL_3.3.item
M packaging/ovirt-engine-dwh-setup.py
M packaging/ovirt-engine-dwh.spec.in
7 files changed, 10 insertions(+), 11 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/02/22402/1
diff --git a/Makefile b/Makefile
index cef7bf0..870aa20 100644
--- a/Makefile
+++ b/Makefile
@@ -151,7 +151,6 @@
install -d $(DESTDIR)$(DATA_DIR)
install -d $(DESTDIR)$(DATA_DIR)/etl
install -d $(DESTDIR)$(DATA_DIR)/db-scripts
- install -d $(DESTDIR)$(SYSCONF_DIR)/ovirt-engine/$(OVIRT_DWH_NAME)
install -d $(DESTDIR)$(SYSCONF_DIR)/$(OVIRT_DWH_NAME)/engine-dwh.conf.d
install -d $(DESTDIR)$(SYSCONF_DIR)/cron.hourly
install -d $(DESTDIR)$(SYSCONF_DIR)/logrotate.d
@@ -163,7 +162,7 @@
install -p -m 755
data-warehouse/history_etl/history_service/etl-common-functions.sh
$(DESTDIR)$(DATA_DIR)/etl
cp -a data-warehouse/history_etl/context_files/*
$(DESTDIR)$(DATA_DIR)/etl
cp -r -a data-warehouse/historydbscripts_postgres/*
$(DESTDIR)$(DATA_DIR)/db-scripts
- install -p -m 660
data-warehouse/history_etl/context_files/ovirt_engine_dwh/historyetl_3_3/contexts/Default.properties
$(DESTDIR)$(SYSCONF_DIR)/ovirt-engine/$(OVIRT_DWH_NAME)
+ install -p -m 660
data-warehouse/history_etl/context_files/ovirt_engine_dwh/historyetl_3_3/contexts/Default.properties
$(DESTDIR)$(SYSCONF_DIR)/$(OVIRT_DWH_NAME)
install -p -m 644 packaging/resources/$(OVIRT_DWH_NAME)d.logrotate
$(DESTDIR)$(SYSCONF_DIR)/logrotate.d/$(OVIRT_DWH_NAME)d
install -p -m 755 packaging/resources/ovirt_engine_dwh_watchdog.cron
$(DESTDIR)$(SYSCONF_DIR)/cron.hourly
diff --git
a/data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/historyetl_3_3/HistoryETL.java
b/data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/historyetl_3_3/HistoryETL.java
index ba23562..601c5fa 100644
---
a/data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/historyetl_3_3/HistoryETL.java
+++
b/data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/historyetl_3_3/HistoryETL.java
@@ -3763,7 +3763,7 @@
int tos_count_tFileInputProperties_1 = 0;
java.io.File file_tFileInputProperties_1 = new
java.io.File(
-
"/etc/ovirt-engine/ovirt-engine-dwh/Default.properties");
+
"/etc/ovirt-engine-dwh/Default.properties");
java.util.Properties
properties_tFileInputProperties_1 = new java.util.Properties();
properties_tFileInputProperties_1
.load(new
java.io.FileInputStream(
diff --git a/data-warehouse/history_etl/etl_sources/packaging/pom.xml
b/data-warehouse/history_etl/etl_sources/packaging/pom.xml
index 90b4ec0..1d91aa9 100644
--- a/data-warehouse/history_etl/etl_sources/packaging/pom.xml
+++ b/data-warehouse/history_etl/etl_sources/packaging/pom.xml
@@ -173,7 +173,7 @@
<property name="deployment.dir"
location="${dwh.deploymentDir}"/>
<echo>*** Deleting
${deployment.dir}${file.separator}...</echo>
<delete dir="${deployment.dir}"/>
- <echo>*** To completely remove run root_etl_undeploy.sh.
config folders are located in /etc/ovirt-engine/ovirt-engine-dwh and
/etc/logrotate.d/ovirt-engine-dwhd and should be removed manually...</echo>
+ <echo>*** To completely remove run root_etl_undeploy.sh.
config folders are located in /etc/ovirt-engine-dwh and
/etc/logrotate.d/ovirt-engine-dwhd and should be removed manually...</echo>
</tasks>
</configuration>
diff --git
a/data-warehouse/history_etl/etl_sources/packaging/root_etl_deploy.sh
b/data-warehouse/history_etl/etl_sources/packaging/root_etl_deploy.sh
index 6f5debc..e1a304d 100755
--- a/data-warehouse/history_etl/etl_sources/packaging/root_etl_deploy.sh
+++ b/data-warehouse/history_etl/etl_sources/packaging/root_etl_deploy.sh
@@ -20,7 +20,7 @@
echo
mkdir -p /var/log/ovirt-engine/ > /dev/null 2>&1
mkdir -p /etc/logrotate.d/ovirt-engine-dwhd > /dev/null 2>&1
-mkdir -p /etc/ovirt-engine/ovirt-engine-dwh > /dev/null 2>&1
+mkdir -p /etc/ovirt-engine-dwh > /dev/null 2>&1
echo
echo -- Copying history service to /etc/init.d and setting it up --
@@ -43,9 +43,9 @@
echo -- Adding history service to linux --
echo
if [ ${USER} = "root" ]; then
- ln -s -f /${USER}/ovirt-engine-dwh/etl/config/Default.properties
/etc/ovirt-engine/ovirt-engine-dwh
+ ln -s -f /${USER}/ovirt-engine-dwh/etl/config/Default.properties
/etc/ovirt-engine-dwh
else
- ln -s -f /home/${USER}/ovirt-engine-dwh/etl/config/Default.properties
/etc/ovirt-engine/ovirt-engine-dwh
+ ln -s -f /home/${USER}/ovirt-engine-dwh/etl/config/Default.properties
/etc/ovirt-engine-dwh
fi
chmod 744 /etc/init.d/ovirt-engine-dwhd
/sbin/chkconfig --add ovirt-engine-dwhd
diff --git a/data-warehouse/history_etl/tos_project/process/HistoryETL_3.3.item
b/data-warehouse/history_etl/tos_project/process/HistoryETL_3.3.item
index 30a51c2..dcd6b5c 100644
--- a/data-warehouse/history_etl/tos_project/process/HistoryETL_3.3.item
+++ b/data-warehouse/history_etl/tos_project/process/HistoryETL_3.3.item
@@ -192,7 +192,7 @@
<elementParameter field="CLOSED_LIST" name="FILE_FORMAT"
value="PROPERTIES_FORMAT"/>
<elementParameter field="CLOSED_LIST" name="RETRIVE_MODE"
value="RETRIVE_BY_SECTION"/>
<elementParameter field="TEXT" name="SECTION_NAME"
value=""section""/>
- <elementParameter field="FILE" name="FILENAME"
value=""/etc/ovirt-engine/ovirt-engine-dwh/Default.properties""/>
+ <elementParameter field="FILE" name="FILENAME"
value=""/etc/ovirt-engine-dwh/Default.properties""/>
<elementParameter field="ENCODING_TYPE" name="ENCODING"
value=""ISO-8859-15""/>
<elementParameter field="TECHNICAL" name="ENCODING:ENCODING_TYPE"
value="ISO-8859-15"/>
<elementParameter field="TEXT" name="CONNECTION_FORMAT" value="row"/>
diff --git a/packaging/ovirt-engine-dwh-setup.py
b/packaging/ovirt-engine-dwh-setup.py
index 27c10d1..f4b6d5d 100755
--- a/packaging/ovirt-engine-dwh-setup.py
+++ b/packaging/ovirt-engine-dwh-setup.py
@@ -43,7 +43,7 @@
PATH_WATCHDOG="/usr/share/ovirt-engine-dwh/etl/ovirt_engine_dwh_watchdog.cron"
EXEC_CREATE_SCHEMA="create_schema.sh"
EXEC_UPGRADE_DB="upgrade.sh"
-FILE_DB_CONN = "/etc/ovirt-engine/ovirt-engine-dwh/Default.properties"
+FILE_DB_CONN = "/etc/ovirt-engine-dwh/Default.properties"
FILE_ENGINE_CONF_DEFAULTS = "/usr/share/ovirt-engine/conf/engine.conf.defaults"
FILE_ENGINE_CONF = "/etc/ovirt-engine/engine.conf"
FILE_DATABASE_CONFIG = "/etc/ovirt-engine/engine.conf.d/10-setup-database.conf"
diff --git a/packaging/ovirt-engine-dwh.spec.in
b/packaging/ovirt-engine-dwh.spec.in
index 96bed14..d50d5a7 100644
--- a/packaging/ovirt-engine-dwh.spec.in
+++ b/packaging/ovirt-engine-dwh.spec.in
@@ -132,12 +132,12 @@
%dir %attr(-, %{engine_user}, %{engine_group})
%{_sysconfdir}/%{dwh_name}/engine-dwh.conf.d
-%dir %{_sysconfdir}/ovirt-engine/%{dwh_name}
+%dir %{_sysconfdir}/%{dwh_name}
%{_initddir}/%{dwh_name}d
%config(noreplace) %{_sysconfdir}/logrotate.d/%{dwh_name}d
%{_bindir}/%{dwh_name}-setup
%{_sysconfdir}/cron.hourly/ovirt_engine_dwh_watchdog.cron
-%config(noreplace) %attr(-, %{engine_user}, %{engine_group})
%{_sysconfdir}/ovirt-engine/%{dwh_name}/Default.properties
+%config(noreplace) %attr(-, %{engine_user}, %{engine_group})
%{_sysconfdir}/%{dwh_name}/Default.properties
%changelog
* Thu Apr 19 2012 Yaniv Dary <yd...@redhat.com> - 3.0.0-1.fc16
--
To view, visit http://gerrit.ovirt.org/22402
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7dd02f65532336152f81f73104112e0a8e5333a7
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
