Repository: incubator-slider Updated Branches: refs/heads/develop 60bfad558 -> fbfc76ada
SLIDER-508 move some client properties to default client conf file Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/fbfc76ad Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/fbfc76ad Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/fbfc76ad Branch: refs/heads/develop Commit: fbfc76ada6166f674d9233f3f5802b24f0053f06 Parents: 60bfad5 Author: Billie Rinaldi <[email protected]> Authored: Wed Oct 15 20:24:41 2014 -0700 Committer: Billie Rinaldi <[email protected]> Committed: Wed Oct 15 20:24:41 2014 -0700 ---------------------------------------------------------------------- app-packages/accumulo/appConfig-default.json | 4 ---- app-packages/accumulo/configuration/client.xml | 11 ++++++++--- 2 files changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/fbfc76ad/app-packages/accumulo/appConfig-default.json ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/appConfig-default.json b/app-packages/accumulo/appConfig-default.json index 3f9f26a..a197b20 100644 --- a/app-packages/accumulo/appConfig-default.json +++ b/app-packages/accumulo/appConfig-default.json @@ -21,10 +21,6 @@ "site.accumulo-env.zookeeper_home": "${zk.dir}", "site.client.instance.name": "${USER}-${CLUSTER_NAME}", - "site.client.instance.zookeeper.host": "${@//site/accumulo-site/instance.zookeeper.host}", - "site.client.instance.rpc.ssl.enabled": "${@//site/accumulo-site/instance.rpc.ssl.enabled}", - "site.client.instance.rpc.ssl.clientAuth": "${@//site/accumulo-site/instance.rpc.ssl.clientAuth}", - "site.client.general.security.credential.provider.paths": "${@//site/accumulo-site/general.security.credential.provider.paths}", "site.global.accumulo_root_password": "NOT_USED", "site.global.ssl_cert_dir": "ssl", http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/fbfc76ad/app-packages/accumulo/configuration/client.xml ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/configuration/client.xml b/app-packages/accumulo/configuration/client.xml index 86e90d5..481b7d1 100644 --- a/app-packages/accumulo/configuration/client.xml +++ b/app-packages/accumulo/configuration/client.xml @@ -28,17 +28,22 @@ </property> <property> <name>instance.zookeeper.host</name> - <value>localhost:2181</value> + <value>${@//site/accumulo-site/instance.zookeeper.host}</value> <description>Zookeeper hosts.</description> </property> <property> <name>instance.rpc.ssl.enabled</name> - <value>false</value> + <value>${@//site/accumulo-site/instance.rpc.ssl.enabled}</value> <description>SSL enabled.</description> </property> <property> <name>instance.rpc.ssl.clientAuth</name> - <value>false</value> + <value>${@//site/accumulo-site/instance.rpc.ssl.clientAuth}</value> <description>SSL client auth enabled.</description> </property> + <property> + <name>general.security.credential.provider.paths</name> + <value>${@//site/accumulo-site/general.security.credential.provider.paths}</value> + <description>Client credential provider containing cert passwords.</description> + </property> </configuration>
