Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: osinfo: add README and overwrite warning for defaults ......................................................................
packaging: osinfo: add README and overwrite warning for defaults Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1025794 Change-Id: I6ac7a780de042d57775762f72a1cc378b0dd51b1 Signed-off-by: Alon Bar-Lev <alo...@redhat.com> --- M Makefile M ovirt-engine.spec.in M packaging/conf/osinfo-defaults.properties A packaging/etc/osinfo.conf.d/README 4 files changed, 18 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/21/21121/1 diff --git a/Makefile b/Makefile index 6047d31..a3fb6ce 100644 --- a/Makefile +++ b/Makefile @@ -383,7 +383,6 @@ install -d -m 755 "$(DESTDIR)$(PKG_SYSCONF_DIR)/branding" -rm -f "$(DESTDIR)$(PKG_SYSCONF_DIR)/branding/00-ovirt.brand" ln -s "$(DATA_DIR)/branding/ovirt.brand" "$(DESTDIR)$(PKG_SYSCONF_DIR)/branding/00-ovirt.brand" - install -d -m 755 "$(DESTDIR)$(PKG_SYSCONF_DIR)/osinfo.conf.d" ln -sf "$(DATA_DIR)/conf/osinfo-defaults.properties" "$(DESTDIR)$(PKG_SYSCONF_DIR)/osinfo.conf.d/00-defaults.properties" # legacy-begin diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in index 167b986..0a5f6bd 100644 --- a/ovirt-engine.spec.in +++ b/ovirt-engine.spec.in @@ -734,7 +734,6 @@ %dir %{engine_data}/bin %dir %{engine_data}/ui-plugins %dir %{engine_ear} -%dir %{engine_etc}/osinfo.conf.d %{engine_data}/conf/osinfo-defaults.properties %{engine_data}/files/ %{engine_data}/manual/ @@ -743,7 +742,7 @@ %{engine_ear}/lib %{engine_ear}/root.war %{engine_ear}/scheduler.jar -%{engine_etc}/osinfo.conf.d/00-defaults.properties +%{engine_etc}/osinfo.conf.d/ %{engine_java}/bll.jar %{engine_java}/dal.jar %{engine_java}/scheduler.jar diff --git a/packaging/conf/osinfo-defaults.properties b/packaging/conf/osinfo-defaults.properties index 9f3bd7e..e236f96 100644 --- a/packaging/conf/osinfo-defaults.properties +++ b/packaging/conf/osinfo-defaults.properties @@ -1,12 +1,18 @@ # 00-os.properties # -# This is a configuration file for provisioning the engine OSs. Its features: +# ATTENTION: DO NOT MODIFY THIS FILE. +# +# CREATE YOUR OWN CONFIGURAITON OVERRIDING DEFAULTS WITHIN THIS FILE. +# +# ---------------------------------------------------------------------------------- +# +# This is a default configuration file for provisioning the engine OSs. Its features: # # * Value versions - # values can be different per compatibility versions; # os.RHEL6.key.value = foo // a general version value # os.RHEL6.key.value.version.3.2 = bar // 3.2 compatibility version value - +# # * value overriding - # Supports versions of configuration through file prefix # e.g - all or some entries in this file can be overridden by entries in diff --git a/packaging/etc/osinfo.conf.d/README b/packaging/etc/osinfo.conf.d/README new file mode 100644 index 0000000..83feca6 --- /dev/null +++ b/packaging/etc/osinfo.conf.d/README @@ -0,0 +1,9 @@ +osinfo configuration directory + +Only *.properties are considered. + +Files are sorted by name, last wins. + +Product defaults is available at 00-defaults.properties. + +Create your own configuration to override product defaults. -- To view, visit http://gerrit.ovirt.org/21121 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6ac7a780de042d57775762f72a1cc378b0dd51b1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.3 Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
