Repository: incubator-slider Updated Branches: refs/heads/develop 33d6f4b84 -> f2b39adfa
SLIDER-850 add tracer node to default configs, add other missing defaults to accumulo-site.xml Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/f2b39adf Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/f2b39adf Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/f2b39adf Branch: refs/heads/develop Commit: f2b39adfaf0b445e2fedd344fc45226cef575a90 Parents: 33d6f4b Author: Billie Rinaldi <billie.rina...@gmail.com> Authored: Fri Apr 10 17:11:12 2015 -0700 Committer: Billie Rinaldi <billie.rina...@gmail.com> Committed: Fri Apr 10 17:11:12 2015 -0700 ---------------------------------------------------------------------- app-packages/accumulo/appConfig-default.json | 1 + .../accumulo/appConfig-secured-default.json | 1 + .../accumulo/appConfig-ssl-default.json | 1 + .../accumulo/configuration/accumulo-site.xml | 24 ++++++++++++++++++++ app-packages/accumulo/configuration/client.xml | 5 ++++ 5 files changed, 32 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f2b39adf/app-packages/accumulo/appConfig-default.json ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/appConfig-default.json b/app-packages/accumulo/appConfig-default.json index fcaaeb4..58ec06e 100644 --- a/app-packages/accumulo/appConfig-default.json +++ b/app-packages/accumulo/appConfig-default.json @@ -50,6 +50,7 @@ "site.accumulo-site.tserver.walog.max.size": "40M", "site.accumulo-site.trace.user": "root", + "site.accumulo-site.trace.zookeeper.path": "${DEFAULT_ZK_PATH}-tracers", "site.accumulo-site.master.port.client": "0", "site.accumulo-site.trace.port.client": "0", http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f2b39adf/app-packages/accumulo/appConfig-secured-default.json ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/appConfig-secured-default.json b/app-packages/accumulo/appConfig-secured-default.json index df44f37..0f085f8 100644 --- a/app-packages/accumulo/appConfig-secured-default.json +++ b/app-packages/accumulo/appConfig-secured-default.json @@ -49,6 +49,7 @@ "site.accumulo-site.general.delegation.token.update.interval": "1d", "site.accumulo-site.trace.user": "${USER_NAME}@EXAMPLE.COM", + "site.accumulo-site.trace.zookeeper.path": "${DEFAULT_ZK_PATH}-tracers", "site.accumulo-site.trace.token.property.keytab": "${AGENT_WORK_ROOT}/keytabs/${USER_NAME}.ACCUMULO.headless.keytab", "site.accumulo-site.trace.token.type": "org.apache.accumulo.core.client.security.tokens.KerberosToken", http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f2b39adf/app-packages/accumulo/appConfig-ssl-default.json ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/appConfig-ssl-default.json b/app-packages/accumulo/appConfig-ssl-default.json index 7e84fc1..857b2c6 100644 --- a/app-packages/accumulo/appConfig-ssl-default.json +++ b/app-packages/accumulo/appConfig-ssl-default.json @@ -58,6 +58,7 @@ "site.accumulo-site.tserver.walog.max.size": "40M", "site.accumulo-site.trace.user": "root", + "site.accumulo-site.trace.zookeeper.path": "${DEFAULT_ZK_PATH}-tracers", "site.accumulo-site.master.port.client": "0", "site.accumulo-site.trace.port.client": "0", http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f2b39adf/app-packages/accumulo/configuration/accumulo-site.xml ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/configuration/accumulo-site.xml b/app-packages/accumulo/configuration/accumulo-site.xml index 3001c45..27653c7 100644 --- a/app-packages/accumulo/configuration/accumulo-site.xml +++ b/app-packages/accumulo/configuration/accumulo-site.xml @@ -58,6 +58,30 @@ </property> <property> + <name>instance.rpc.ssl.enabled</name> + <value>false</value> + <description>SSL enabled.</description> + </property> + + <property> + <name>instance.rpc.ssl.clientAuth</name> + <value>false</value> + <description>SSL client auth enabled.</description> + </property> + + <property> + <name>instance.rpc.sasl.enabled</name> + <value>false</value> + <description>SASL enabled.</description> + </property> + + <property> + <name>trace.zookeeper.path</name> + <value>/tracers</value> + <description>ZooKeeper path where Accumulo tracers register.</description> + </property> + + <property> <name>general.classpaths</name> <!-- Add the following for hadoop-2.0 http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f2b39adf/app-packages/accumulo/configuration/client.xml ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/configuration/client.xml b/app-packages/accumulo/configuration/client.xml index ea59083..81d9103 100644 --- a/app-packages/accumulo/configuration/client.xml +++ b/app-packages/accumulo/configuration/client.xml @@ -46,4 +46,9 @@ <value>${@//site/accumulo-site/instance.rpc.sasl.enabled}</value> <description>SASL enabled.</description> </property> + <property> + <name>trace.zookeeper.path</name> + <value>${@//site/accumulo-site/trace.zookeeper.path}</value> + <description>ZooKeeper path where Accumulo tracers register.</description> + </property> </configuration>
