You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by bi...@apache.org on 2015/05/12 22:54:44 UTC
ambari git commit: AMBARI-11084 Newlines missing at end of Accumulo
command helper files
Repository: ambari
Updated Branches:
refs/heads/trunk e6b3972f4 -> 6701cfc17
AMBARI-11084 Newlines missing at end of Accumulo command helper files
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6701cfc1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6701cfc1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6701cfc1
Branch: refs/heads/trunk
Commit: 6701cfc172a5cea92766a125e707ee439c0a7686
Parents: e6b3972
Author: Billie Rinaldi <bi...@gmail.com>
Authored: Tue May 12 13:52:47 2015 -0700
Committer: Billie Rinaldi <bi...@gmail.com>
Committed: Tue May 12 13:53:42 2015 -0700
----------------------------------------------------------------------
.../package/scripts/accumulo_configuration.py | 12 ++++++------
.../1.6.1.2.2.0/package/scripts/service_check.py | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6701cfc1/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_configuration.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_configuration.py b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_configuration.py
index f26fdd0..d30a460 100644
--- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_configuration.py
+++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_configuration.py
@@ -196,7 +196,7 @@ def setup_conf_dir(name=None): # 'master' or 'tserver' or 'monitor' or 'gc' or '
group=params.user_group,
owner=params.accumulo_user,
content=InlineTemplate('{{root_password}}\n'
- '{{root_password}}\n')
+ '{{root_password}}\n\n')
)
Execute( format("cat {passfile} | {params.daemon_script} init "
"--instance-name {params.instance_name} "
@@ -252,7 +252,7 @@ def setup_conf_dir(name=None): # 'master' or 'tserver' or 'monitor' or 'gc' or '
owner=params.accumulo_user,
content=InlineTemplate('grant -t trace -u {{trace_user}} Table.ALTER_TABLE\n'
'grant -t trace -u {{trace_user}} Table.READ\n'
- 'grant -t trace -u {{trace_user}} Table.WRITE\n')
+ 'grant -t trace -u {{trace_user}} Table.WRITE\n\n')
)
if params.security_enabled and params.has_secure_user_auth:
Execute( format("{params.kinit_cmd} {params.daemon_script} shell -f "
@@ -273,7 +273,7 @@ def setup_conf_dir(name=None): # 'master' or 'tserver' or 'monitor' or 'gc' or '
mode=0600,
group=params.user_group,
owner=params.accumulo_user,
- content=InlineTemplate('{{root_password}}\n')
+ content=InlineTemplate('{{root_password}}\n\n')
)
Execute( format("cat {rpassfile} | {params.daemon_script} shell -f "
"{cmdfile} -u root"),
@@ -308,7 +308,7 @@ def create_user(user, password):
group=params.user_group,
owner=params.accumulo_user,
content=InlineTemplate(format("createuser {user}\n"
- "grant -s System.CREATE_TABLE -u {user}\n"))
+ "grant -s System.CREATE_TABLE -u {user}\n\n"))
)
if params.security_enabled and params.has_secure_user_auth:
Execute( format("{params.kinit_cmd} {params.daemon_script} shell -f "
@@ -323,7 +323,7 @@ def create_user(user, password):
mode=0600,
group=params.user_group,
owner=params.accumulo_user,
- content=InlineTemplate('{{root_password}}\n')
+ content=InlineTemplate('{{root_password}}\n\n')
)
File(passfile,
mode=0600,
@@ -331,7 +331,7 @@ def create_user(user, password):
owner=params.accumulo_user,
content=InlineTemplate(format("{params.root_password}\n"
"{password}\n"
- "{password}\n"))
+ "{password}\n\n"))
)
Execute( format("cat {passfile} | {params.daemon_script} shell -u root "
"-f {cmdfile}"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/6701cfc1/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/service_check.py
index d4e574f..01be0fe 100644
--- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/service_check.py
+++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/service_check.py
@@ -39,7 +39,7 @@ class AccumuloServiceCheck(Script):
'scan\n'
'flush -w\n'
'scan\n'
- 'deletetable -f testtable\n')
+ 'deletetable -f testtable\n\n')
)
if params.security_enabled and params.has_secure_user_auth:
Execute( format("{smokeuser_kinit_cmd} "