Merge pull request #611 from ajf8/ncm_hostsfile_squash_config

ncm-hostsfile: merge config-{common,rpm} into config.pan
quattor · Dec 2, 2015 · 9d659db · 9d659db
2 parents 028ec3a + d1d6449
commit 9d659db
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 34 deletions.
diff --git a/ncm-hostsfile/src/main/pan/components/hostsfile/config-common.pan b/ncm-hostsfile/src/main/pan/components/hostsfile/config-common.pan
diff --git a/ncm-hostsfile/src/main/pan/components/hostsfile/config-rpm.pan b/ncm-hostsfile/src/main/pan/components/hostsfile/config-rpm.pan
diff --git a/ncm-hostsfile/src/main/pan/components/hostsfile/config.pan b/ncm-hostsfile/src/main/pan/components/hostsfile/config.pan
@@ -5,5 +5,14 @@
 
 unique template components/${project.artifactId}/config;
 
-include { 'components/${project.artifactId}/config-common' };
-include { 'components/${project.artifactId}/config-rpm' };
+include 'components/${project.artifactId}/schema';
+
+# Package to install
+"/software/packages" = pkg_repl("ncm-${project.artifactId}", "${no-snapshot-version}-${rpm.release}", "noarch");
+
+# Set prefix to root of component configuration.
+prefix '/software/components/${project.artifactId}';
+
+'version' = '${no-snapshot-version}';
+'active' ?= false;
+'dispatch' ?= false;