Repository: incubator-slider Updated Branches: refs/heads/develop 32f1b6b84 -> 1b9749c2d
SLIDER-360. Accumulo package fails to deploy as Slider expects config files to be supported to be specified in the metainfo Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/1b9749c2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/1b9749c2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/1b9749c2 Branch: refs/heads/develop Commit: 1b9749c2dc5436cf46bfec33983fb8158c943600 Parents: 32f1b6b Author: Sumit Mohanty <smoha...@hortonworks.com> Authored: Mon Aug 25 14:10:03 2014 -0700 Committer: Sumit Mohanty <smoha...@hortonworks.com> Committed: Mon Aug 25 14:10:10 2014 -0700 ---------------------------------------------------------------------- app-packages/accumulo/appConfig.json | 13 ------------- app-packages/accumulo/metainfo.xml | 8 ++++++++ 2 files changed, 8 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1b9749c2/app-packages/accumulo/appConfig.json ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/appConfig.json b/app-packages/accumulo/appConfig.json index 6b7033e..e9ca2ba 100644 --- a/app-packages/accumulo/appConfig.json +++ b/app-packages/accumulo/appConfig.json @@ -4,14 +4,11 @@ }, "global": { "application.def": "${app.package.name}.zip", - "config_types": "accumulo-site", "java_home": "/usr/jdk64/jdk1.7.0_45", - "package_list": "files/accumulo-${accumulo.version}-bin.tar.gz", "site.global.app_user": "yarn", "site.global.app_log_dir": "${AGENT_LOG_ROOT}", "site.global.app_pid_dir": "${AGENT_WORK_ROOT}/app/run", "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/accumulo-${accumulo.version}", - "site.global.app_install_dir": "${AGENT_WORK_ROOT}/app/install", "site.global.tserver_heapsize": "128m", "site.global.master_heapsize": "128m", "site.global.monitor_heapsize": "64m", @@ -44,18 +41,8 @@ "site.accumulo-site.general.classpaths": "$ACCUMULO_HOME/lib/accumulo-server.jar,\n$ACCUMULO_HOME/lib/accumulo-core.jar,\n$ACCUMULO_HOME/lib/accumulo-start.jar,\n$ACCUMULO_HOME/lib/accumulo-fate.jar,\n$ACCUMULO_HOME/lib/accumulo-proxy.jar,\n$ACCUMULO_HOME/lib/[^.].*.jar,\n$ZOOKEEPER_HOME/zookeeper[^.].*.jar,\n$HADOOP_CONF_DIR,\n$HADOOP_PREFIX/[^.].*.jar,\n$HADOOP_PREFIX/lib/[^.].*.jar,\n$HADOOP_PREFIX/share/hadoop/common/.*.jar,\n$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,\n$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,\n$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,\n$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,\n/usr/lib/hadoop/.*.jar,\n/usr/lib/hadoop/lib/.*.jar,\n/usr/lib/hadoop-hdfs/.*.jar,\n/usr/lib/hadoop-mapreduce/.*.jar,\n/usr/lib/hadoop-yarn/.*.jar," }, "components": { - "ACCUMULO_MASTER": { - }, "slider-appmaster": { "jvm.heapsize": "256M" - }, - "ACCUMULO_TSERVER": { - }, - "ACCUMULO_MONITOR": { - }, - "ACCUMULO_GC": { - }, - "ACCUMULO_TRACER": { } } } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1b9749c2/app-packages/accumulo/metainfo.xml ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/metainfo.xml b/app-packages/accumulo/metainfo.xml index b1aa9de..512ba4a 100644 --- a/app-packages/accumulo/metainfo.xml +++ b/app-packages/accumulo/metainfo.xml @@ -144,5 +144,13 @@ </osSpecific> </osSpecifics> + <configFiles> + <configFile> + <type>xml</type> + <fileName>accumulo-site.xml</fileName> + <dictionaryName>accumulo-site</dictionaryName> + </configFile> + </configFiles> + </application> </metainfo>