AMBARI-4678. Custom log4j configs should be stored as raw text. (Dmitry Sen via mahadev)

ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/params.py

@@ -176,26 +176,24 @@ if dfs_ha_enabled:
 dfs_hosts = default('/configurations/hdfs-site/dfs.hosts', None)
 
 #log4j.properties
-rca_property_map = {
-  'ambari.jobhistory.database': ambari_db_rca_url,
-  'ambari.jobhistory.driver': ambari_db_rca_driver,
-  'ambari.jobhistory.user': ambari_db_rca_username,
-  'ambari.jobhistory.password': ambari_db_rca_password,
-  'ambari.jobhistory.logger': 'DEBUG,JHA',
-
-  'log4j.appender.JHA': 'org.apache.ambari.log4j.hadoop.mapreduce.jobhistory.JobHistoryAppender',
-  'log4j.appender.JHA.database': '${ambari.jobhistory.database}',
-  'log4j.appender.JHA.driver': '${ambari.jobhistory.driver}',
-  'log4j.appender.JHA.user': '${ambari.jobhistory.user}',
-  'log4j.appender.JHA.password': '${ambari.jobhistory.password}',
-
-  'log4j.logger.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger': '${ambari.jobhistory.logger}',
-  'log4j.additivity.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger': 'true'
-}
-
-if ('hdfs-log4j' in config['configurations']):
-  log4j_props = config['configurations']['hdfs-log4j']
-  if 'mapreduce-log4j' in config['configurations']:
-    log4j_props.update(config['configurations']['mapreduce-log4j'])
+rca_properties = format('''
+
+log4j.appender.JHA=org.apache.ambari.log4j.hadoop.mapreduce.jobhistory.JobHistoryAppender
+log4j.appender.JHA.database={ambari_db_rca_url}
+log4j.appender.JHA.driver={ambari_db_rca_driver}
+log4j.appender.JHA.user={ambari_db_rca_username}
+log4j.appender.JHA.password={ambari_db_rca_password}
+
+log4j.logger.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger=DEBUG,JHA
+log4j.additivity.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger=true
+
+''')
+
+if (('hdfs-log4j' in config['configurations']) and ('content' in config['configurations']['hdfs-log4j'])):
+  log4j_props = config['configurations']['hdfs-log4j']['content']
+  if (('mapreduce-log4j' in config['configurations']) and ('content' in config['configurations']['mapreduce-log4j'])):
+    log4j_props += config['configurations']['mapreduce-log4j']['content']
+    if rca_enabled:
+      log4j_props += rca_properties
 else:
   log4j_props = None

ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/shared_initialization.py

@@ -143,11 +143,11 @@ def setup_hadoop():
 
   log4j_filename = os.path.join(params.hadoop_conf_dir, "log4j.properties")
   if (params.log4j_props != None):
-    PropertiesFile(log4j_filename,
-                   properties=params.log4j_props,
-                   mode=0664,
-                   owner=params.hdfs_user,
-                   group=params.user_group,
+    File(log4j_filename,
+         mode=0644,
+         group=params.user_group,
+         owner=params.hdfs_user,
+         content=params.log4j_props
     )
   elif (os.path.exists(format("{params.hadoop_conf_dir}/log4j.properties"))):
     File(log4j_filename,
@@ -156,8 +156,6 @@ def setup_hadoop():
          owner=params.hdfs_user,
     )
 
-  update_log4j_props(log4j_filename)
-
   File(os.path.join(params.hadoop_conf_dir, "hadoop-metrics2.properties"),
        owner=params.hdfs_user,
        content=Template("hadoop-metrics2.properties.j2")
@@ -277,16 +275,6 @@ def setup_configs():
 
   # generate_include_file()
 
-def update_log4j_props(file):
-  import params
-
-  for key in params.rca_property_map:
-    value = params.rca_property_map[key]
-    Execute(format(
-      "sed -i 's~\\({rca_disabled_prefix}\\)\\?{key}=.*~{rca_prefix}{key}={value}~' {file}")
-    )
-
-
 def generate_include_file():
   import params
 

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase.py

@@ -100,12 +100,11 @@ def hbase(name=None # 'master' or 'regionserver' or 'client'
     )
 
   if (params.log4j_props != None):
-    PropertiesFile('log4j.properties',
-                   dir=params.conf_dir,
-                   properties=params.log4j_props,
-                   mode=0664,
-                   owner=params.hbase_user,
-                   group=params.user_group,
+    File(format("{params.conf_dir}/log4j.properties"),
+         mode=0644,
+         group=params.user_group,
+         owner=params.hbase_user,
+         content=params.log4j_props
     )
   elif (os.path.exists(format("{params.conf_dir}/log4j.properties"))):
     File(format("{params.conf_dir}/log4j.properties"),

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py

@@ -95,8 +95,8 @@ else:
   kinit_cmd = ""
 
 #log4j.properties
-if ('hbase-log4j' in config['configurations']):
-  log4j_props = config['configurations']['hbase-log4j']
+if (('hbase-log4j' in config['configurations']) and ('content' in config['configurations']['hbase-log4j'])):
+  log4j_props = config['configurations']['hbase-log4j']['content']
 else:
   log4j_props = None
 
@@ -119,4 +119,4 @@ HdfsDirectory = functools.partial(
   security_enabled = security_enabled,
   keytab = hdfs_user_keytab,
   kinit_path_local = kinit_path_local
-)
+)

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/hive.py

@@ -95,12 +95,11 @@ def hive(name=None):
 
   log4j_exec_filename = 'hive-exec-log4j.properties'
   if (params.log4j_exec_props != None):
-    PropertiesFile(log4j_exec_filename,
-                   dir=params.hive_conf_dir,
-                   properties=params.log4j_exec_props,
-                   mode=0664,
-                   owner=params.hive_user,
-                   group=params.user_group
+    File(format("{params.hive_conf_dir}/{log4j_exec_filename}"),
+         mode=0644,
+         group=params.user_group,
+         owner=params.hive_user,
+         content=params.log4j_exec_props
     )
   elif (os.path.exists("{params.hive_conf_dir}/{log4j_exec_filename}.template")):
     File(format("{params.hive_conf_dir}/{log4j_exec_filename}"),
@@ -112,12 +111,11 @@ def hive(name=None):
 
   log4j_filename = 'hive-log4j.properties'
   if (params.log4j_props != None):
-    PropertiesFile(log4j_filename,
-                   dir=params.hive_conf_dir,
-                   properties=params.log4j_props,
-                   mode=0664,
-                   owner=params.hive_user,
-                   group=params.user_group
+    File(format("{params.hive_conf_dir}/{log4j_filename}"),
+         mode=0644,
+         group=params.user_group,
+         owner=params.hive_user,
+         content=params.log4j_props
     )
   elif (os.path.exists("{params.hive_conf_dir}/{log4j_filename}.template")):
     File(format("{params.hive_conf_dir}/{log4j_filename}"),

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/params.py

@@ -124,14 +124,14 @@ hcat_log_dir = config['configurations']['global']['hcat_log_dir']   #hcat_log_di
 hadoop_conf_dir = '/etc/hadoop/conf'
 
 #hive-log4j.properties.template
-if ('hive-log4j' in config['configurations']):
-  log4j_props = config['configurations']['hive-log4j']
+if (('hive-log4j' in config['configurations']) and ('content' in config['configurations']['hive-log4j'])):
+  log4j_props = config['configurations']['hive-log4j']['content']
 else:
   log4j_props = None
 
 #hive-exec-log4j.properties.template
-if ('hive-exec-log4j' in config['configurations']):
-  log4j_exec_props = config['configurations']['hive-exec-log4j']
+if (('hive-exec-log4j' in config['configurations']) and ('content' in config['configurations']['hive-exec-log4j'])):
+  log4j_exec_props = config['configurations']['hive-exec-log4j']['content']
 else:
   log4j_exec_props = None
   
@@ -157,4 +157,4 @@ HdfsDirectory = functools.partial(
   security_enabled = security_enabled,
   keytab = hdfs_user_keytab,
   kinit_path_local = kinit_path_local
-)
+)

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/scripts/oozie.py

@@ -29,12 +29,11 @@ def oozie(is_server=False
   )
 
   if (params.log4j_props != None):
-    PropertiesFile('oozie-log4j.properties',
-                   dir=params.conf_dir,
-                   properties=params.log4j_props,
-                   mode=0664,
-                   owner=params.oozie_user,
-                   group=params.user_group,
+    File(format("{params.conf_dir}/oozie-log4j.properties"),
+         mode=0644,
+         group=params.user_group,
+         owner=params.oozie_user,
+         content=params.log4j_props
     )
   elif (os.path.exists(format("{params.conf_dir}/oozie-log4j.properties"))):
     File(format("{params.conf_dir}/oozie-log4j.properties"),

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/scripts/params.py

@@ -65,8 +65,8 @@ else:
     jar_path = "{lzo_jar_suffix}{jdbc_driver_jar}"
 
 #oozie-log4j.properties
-if ('oozie-log4j' in config['configurations']):
-  log4j_props = config['configurations']['oozie-log4j']
+if (('oozie-log4j' in config['configurations']) and ('content' in config['configurations']['oozie-log4j'])):
+  log4j_props = config['configurations']['oozie-log4j']['content']
 else:
   log4j_props = None
 
@@ -89,4 +89,4 @@ HdfsDirectory = functools.partial(
   security_enabled = security_enabled,
   keytab = hdfs_user_keytab,
   kinit_path_local = kinit_path_local
-)
+)

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/PIG/package/scripts/params.py

@@ -40,7 +40,7 @@ java64_home = config['hostLevelParams']['java_home']
 hadoop_home = "/usr"
 
 #log4j.properties
-if ('pig-log4j' in config['configurations']):
-  log4j_props = config['configurations']['pig-log4j']
+if (('pig-log4j' in config['configurations']) and ('content' in config['configurations']['pig-log4j'])):
+  log4j_props = config['configurations']['pig-log4j']['content']
 else:
   log4j_props = None

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/PIG/package/scripts/pig.py

@@ -34,12 +34,11 @@ def pig():
   pig_TemplateConfig( ['pig-env.sh','pig.properties'])
 
   if (params.log4j_props != None):
-    PropertiesFile('log4j.properties',
-                   dir=params.pig_conf_dir,
-                   properties=params.log4j_props,
-                   mode=0664,
-                   owner=params.hdfs_user,
-                   group=params.user_group,
+    File(format("{params.pig_conf_dir}/log4j.properties"),
+         mode=0644,
+         group=params.user_group,
+         owner=params.hdfs_user,
+         content=params.log4j_props
     )
   elif (os.path.exists(format("{params.pig_conf_dir}/log4j.properties"))):
     File(format("{params.pig_conf_dir}/log4j.properties"),

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/package/scripts/params.py

@@ -72,7 +72,7 @@ smokeuser = config['configurations']['global']['smokeuser']
 kinit_path_local = functions.get_kinit_path([default("kinit_path_local",None), "/usr/bin", "/usr/kerberos/bin", "/usr/sbin"])
 
 #log4j.properties
-if ('zookeeper-log4j' in config['configurations']):
-  log4j_props = config['configurations']['zookeeper-log4j']
+if (('zookeeper-log4j' in config['configurations']) and ('content' in config['configurations']['zookeeper-log4j'])):
+  log4j_props = config['configurations']['zookeeper-log4j']['content']
 else:
   log4j_props = None

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/package/scripts/zookeeper.py

@@ -65,12 +65,11 @@ def zookeeper(type = None):
     )
 
   if (params.log4j_props != None):
-    PropertiesFile('log4j.properties',
-      dir=params.config_dir,
-      properties=params.log4j_props,
-      mode=0664,
-      owner=params.zk_user,
+    File(format("{params.config_dir}/log4j.properties"),
+      mode=0644,
       group=params.user_group,
+      owner=params.zk_user,
+      content=params.log4j_props
     )
   elif (os.path.exists(format("{params.config_dir}/log4j.properties"))):
     File(format("{params.config_dir}/log4j.properties"),

ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py

@@ -178,26 +178,9 @@ if dfs_ha_enabled:
 dfs_hosts = default('/configurations/hdfs-site/dfs.hosts', None)
 
 #log4j.properties
-rca_property_map = {
-  'ambari.jobhistory.database': ambari_db_rca_url,
-  'ambari.jobhistory.driver': ambari_db_rca_driver,
-  'ambari.jobhistory.user': ambari_db_rca_username,
-  'ambari.jobhistory.password': ambari_db_rca_password,
-  'ambari.jobhistory.logger': 'DEBUG,JHA',
-
-  'log4j.appender.JHA': 'org.apache.ambari.log4j.hadoop.mapreduce.jobhistory.JobHistoryAppender',
-  'log4j.appender.JHA.database': '${ambari.jobhistory.database}',
-  'log4j.appender.JHA.driver': '${ambari.jobhistory.driver}',
-  'log4j.appender.JHA.user': '${ambari.jobhistory.user}',
-  'log4j.appender.JHA.password': '${ambari.jobhistory.password}',
-
-  'log4j.logger.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger': '${ambari.jobhistory.logger}',
-  'log4j.additivity.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger': 'true'
-}
-
-if ('hdfs-log4j' in config['configurations']):
-  log4j_props = config['configurations']['hdfs-log4j']
-  if 'yarn-log4j' in config['configurations']:
-    log4j_props.update(config['configurations']['yarn-log4j'])
+if (('hdfs-log4j' in config['configurations']) and ('content' in config['configurations']['hdfs-log4j'])):
+  log4j_props = config['configurations']['hdfs-log4j']['content']
+  if (('yarn-log4j' in config['configurations']) and ('content' in config['configurations']['yarn-log4j'])):
+    log4j_props += config['configurations']['yarn-log4j']['content']
 else:
   log4j_props = None

ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py

@@ -147,11 +147,11 @@ def setup_hadoop():
 
   log4j_filename = os.path.join(params.hadoop_conf_dir, "log4j.properties")
   if (params.log4j_props != None):
-    PropertiesFile(log4j_filename,
-                   properties=params.log4j_props,
-                   mode=0664,
-                   owner=params.hdfs_user,
-                   group=params.user_group,
+    File(log4j_filename,
+         mode=0644,
+         group=params.user_group,
+         owner=params.hdfs_user,
+         content=params.log4j_props
     )
   elif (os.path.exists(format("{params.hadoop_conf_dir}/log4j.properties"))):
     File(log4j_filename,
@@ -160,8 +160,6 @@ def setup_hadoop():
          owner=params.hdfs_user,
     )
 
-  update_log4j_props(log4j_filename)
-
   File(os.path.join(params.hadoop_conf_dir, "hadoop-metrics2.properties"),
        owner=params.hdfs_user,
        content=Template("hadoop-metrics2.properties.j2")
@@ -282,15 +280,6 @@ def setup_configs():
 
   generate_include_file()
 
-def update_log4j_props(file):
-  import params
-
-  for key in params.rca_property_map:
-    value = params.rca_property_map[key]
-    Execute(format(
-      "sed -i 's~\\({rca_disabled_prefix}\\)\\?{key}=.*~{rca_prefix}{key}={value}~' {file}")
-    )
-
 
 def generate_include_file():
   import params

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase.py

@@ -98,12 +98,11 @@ def hbase(name=None # 'master' or 'regionserver' or 'client'
     )
 
   if (params.log4j_props != None):
-    PropertiesFile('log4j.properties',
-      dir=params.conf_dir,
-      properties=params.log4j_props,
-      mode=0664,
-      owner=params.hbase_user,
-      group=params.user_group,
+    File(format("{params.conf_dir}/log4j.properties"),
+         mode=0644,
+         group=params.user_group,
+         owner=params.hbase_user,
+         content=params.log4j_props
     )
   elif (os.path.exists(format("{params.conf_dir}/log4j.properties"))):
     File(format("{params.conf_dir}/log4j.properties"),

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py

@@ -94,8 +94,8 @@ else:
   kinit_cmd = ""
 
 #log4j.properties
-if ('hbase-log4j' in config['configurations']):
-  log4j_props = config['configurations']['hbase-log4j']
+if (('hbase-log4j' in config['configurations']) and ('content' in config['configurations']['hbase-log4j'])):
+  log4j_props = config['configurations']['hbase-log4j']['content']
 else:
   log4j_props = None
 

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hive.py

@@ -95,12 +95,11 @@ def hive(name=None):
 
   log4j_exec_filename = 'hive-exec-log4j.properties'
   if (params.log4j_exec_props != None):
-    PropertiesFile(log4j_exec_filename,
-                   dir=params.hive_conf_dir,
-                   properties=params.log4j_exec_props,
-                   mode=0664,
-                   owner=params.hive_user,
-                   group=params.user_group
+    File(format("{params.hive_conf_dir}/{log4j_exec_filename}"),
+         mode=0644,
+         group=params.user_group,
+         owner=params.hive_user,
+         content=params.log4j_exec_props
     )
   elif (os.path.exists("{params.hive_conf_dir}/{log4j_exec_filename}.template")):
     File(format("{params.hive_conf_dir}/{log4j_exec_filename}"),
@@ -112,12 +111,11 @@ def hive(name=None):
 
   log4j_filename = 'hive-log4j.properties'
   if (params.log4j_props != None):
-    PropertiesFile(log4j_filename,
-                   dir=params.hive_conf_dir,
-                   properties=params.log4j_props,
-                   mode=0664,
-                   owner=params.hive_user,
-                   group=params.user_group
+    File(format("{params.hive_conf_dir}/{log4j_filename}"),
+         mode=0644,
+         group=params.user_group,
+         owner=params.hive_user,
+         content=params.log4j_props
     )
   elif (os.path.exists("{params.hive_conf_dir}/{log4j_filename}.template")):
     File(format("{params.hive_conf_dir}/{log4j_filename}"),

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py

@@ -128,14 +128,14 @@ hcat_log_dir = config['configurations']['global']['hcat_log_dir']
 hadoop_conf_dir = '/etc/hadoop/conf'
 
 #hive-log4j.properties.template
-if ('hive-log4j' in config['configurations']):
-  log4j_props = config['configurations']['hive-log4j']
+if (('hive-log4j' in config['configurations']) and ('content' in config['configurations']['hive-log4j'])):
+  log4j_props = config['configurations']['hive-log4j']['content']
 else:
   log4j_props = None
 
 #hive-exec-log4j.properties.template
-if ('hive-exec-log4j' in config['configurations']):
-  log4j_exec_props = config['configurations']['hive-exec-log4j']
+if (('hive-exec-log4j' in config['configurations']) and ('content' in config['configurations']['hive-exec-log4j'])):
+  log4j_exec_props = config['configurations']['hive-exec-log4j']['content']
 else:
   log4j_exec_props = None
 
@@ -170,4 +170,4 @@ HdfsDirectory = functools.partial(
   security_enabled = security_enabled,
   keytab = hdfs_user_keytab,
   kinit_path_local = kinit_path_local
-)
+)

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie.py

@@ -51,12 +51,11 @@ def oozie(is_server=False # TODO: see if see can remove this
   )
 
   if (params.log4j_props != None):
-    PropertiesFile('oozie-log4j.properties',
-      dir=params.conf_dir,
-      properties=params.log4j_props,
-      mode=0664,
-      owner=params.oozie_user,
+    File(format("{params.conf_dir}/oozie-log4j.properties"),
+      mode=0644,
       group=params.user_group,
+      owner=params.oozie_user,
+      content=params.log4j_props
     )
   elif (os.path.exists(format("{params.conf_dir}/oozie-log4j.properties"))):
     File(format("{params.conf_dir}/oozie-log4j.properties"),

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py

@@ -78,8 +78,8 @@ has_falcon_host = not len(falcon_host)  == 0
 falcon_home = '/usr/lib/falcon'
 
 #oozie-log4j.properties
-if ('oozie-log4j' in config['configurations']):
-  log4j_props = config['configurations']['oozie-log4j']
+if (('oozie-log4j' in config['configurations']) and ('content' in config['configurations']['oozie-log4j'])):
+  log4j_props = config['configurations']['oozie-log4j']['content']
 else:
   log4j_props = None
 

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/package/scripts/params.py

@@ -40,7 +40,7 @@ java64_home = config['hostLevelParams']['java_home']
 hadoop_home = "/usr"
 
 #log4j.properties
-if ('pig-log4j' in config['configurations']):
-  log4j_props = config['configurations']['pig-log4j']
+if (('pig-log4j' in config['configurations']) and ('content' in config['configurations']['pig-log4j'])):
+  log4j_props = config['configurations']['pig-log4j']['content']
 else:
   log4j_props = None

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/package/scripts/pig.py

@@ -34,12 +34,11 @@ def pig():
   pig_TemplateConfig( ['pig-env.sh','pig.properties'])
 
   if (params.log4j_props != None):
-    PropertiesFile('log4j.properties',
-      dir=params.pig_conf_dir,
-      properties=params.log4j_props,
-      mode=0664,
-      owner=params.hdfs_user,
+    File(format("{params.pig_conf_dir}/log4j.properties"),
+      mode=0644,
       group=params.user_group,
+      owner=params.hdfs_user,
+      content=params.log4j_props
     )
   elif (os.path.exists(format("{params.pig_conf_dir}/log4j.properties"))):
     File(format("{params.pig_conf_dir}/log4j.properties"),

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/params.py

@@ -72,7 +72,7 @@ smokeuser = config['configurations']['global']['smokeuser']
 kinit_path_local = functions.get_kinit_path([default("kinit_path_local",None), "/usr/bin", "/usr/kerberos/bin", "/usr/sbin"])
 
 #log4j.properties
-if ('zookeeper-log4j' in config['configurations']):
-  log4j_props = config['configurations']['zookeeper-log4j']
+if (('zookeeper-log4j' in config['configurations']) and ('content' in config['configurations']['zookeeper-log4j'])):
+  log4j_props = config['configurations']['zookeeper-log4j']['content']
 else:
   log4j_props = None

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/zookeeper.py

@@ -65,12 +65,11 @@ def zookeeper(type = None):
     )
 
   if (params.log4j_props != None):
-    PropertiesFile('log4j.properties',
-                   dir=params.config_dir,
-                   properties=params.log4j_props,
-                   mode=0664,
-                   owner=params.zk_user,
-                   group=params.user_group,
+    File(format("{params.config_dir}/log4j.properties"),
+         mode=0644,
+         group=params.user_group,
+         owner=params.zk_user,
+         content=params.log4j_props
     )
   elif (os.path.exists(format("{params.config_dir}/log4j.properties"))):
     File(format("{params.config_dir}/log4j.properties"),

ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_client.py

@@ -71,13 +71,12 @@ class TestHBaseClient(RMFTestCase):
       owner = 'hbase',
       template_tag = None,
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'log4j.properties',
-                              dir='/etc/hbase/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hbase/conf/log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hbase',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
     self.assertNoMoreResources()
     
@@ -125,13 +124,12 @@ class TestHBaseClient(RMFTestCase):
       owner = 'hbase',
       template_tag = None,
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'log4j.properties',
-                              dir='/etc/hbase/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hbase/conf/log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hbase',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
     self.assertNoMoreResources()
     

ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_master.py

@@ -236,13 +236,12 @@ class TestHBaseMaster(RMFTestCase):
       owner = 'hbase',
       recursive = True,
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'log4j.properties',
-                              dir='/etc/hbase/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hbase/conf/log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hbase',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
   
   def assert_configure_secured(self):
@@ -322,11 +321,10 @@ class TestHBaseMaster(RMFTestCase):
       owner = 'hbase',
       recursive = True,
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'log4j.properties',
-                              dir='/etc/hbase/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hbase/conf/log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hbase',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )

ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_regionserver.py

@@ -170,13 +170,12 @@ class TestHbaseRegionServer(RMFTestCase):
       owner = 'hbase',
       recursive = True,
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'log4j.properties',
-                              dir='/etc/hbase/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hbase/conf/log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hbase',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
   
   
@@ -257,11 +256,10 @@ class TestHbaseRegionServer(RMFTestCase):
       owner = 'hbase',
       recursive = True,
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'log4j.properties',
-                              dir='/etc/hbase/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hbase/conf/log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hbase',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )

ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_client.py

@@ -56,21 +56,19 @@ class TestHiveClient(RMFTestCase):
       owner = 'hive',
       group = 'hadoop',
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-exec-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-exec-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
     self.assertNoMoreResources()
 
@@ -110,20 +108,18 @@ class TestHiveClient(RMFTestCase):
       owner = 'hive',
       group = 'hadoop',
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-exec-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-exec-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
     self.assertNoMoreResources()

ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_metastore.py

@@ -29,21 +29,19 @@ class TestHiveMetastore(RMFTestCase):
                        config_file="default.json"
     )
     self.assert_configure_default()
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-exec-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-exec-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
     self.assertNoMoreResources()
 
@@ -55,21 +53,19 @@ class TestHiveMetastore(RMFTestCase):
     )
 
     self.assert_configure_default()
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-exec-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-exec-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
     self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /tmp/start_metastore_script /var/log/hive/hive.out /var/log/hive/hive.log /var/run/hive/hive.pid /etc/hive/conf.server',
                               not_if = 'ls /var/run/hive/hive.pid >/dev/null 2>&1 && ps `cat /var/run/hive/hive.pid` >/dev/null 2>&1',
@@ -99,21 +95,19 @@ class TestHiveMetastore(RMFTestCase):
                        config_file="secured.json"
     )
     self.assert_configure_default()
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-exec-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-exec-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
     self.assertNoMoreResources()
 
@@ -125,21 +119,19 @@ class TestHiveMetastore(RMFTestCase):
     )
 
     self.assert_configure_secured()
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-exec-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-exec-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
     self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /tmp/start_metastore_script /var/log/hive/hive.out /var/log/hive/hive.log /var/run/hive/hive.pid /etc/hive/conf.server',
                               not_if = 'ls /var/run/hive/hive.pid >/dev/null 2>&1 && ps `cat /var/run/hive/hive.pid` >/dev/null 2>&1',

ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_server.py

@@ -29,21 +29,19 @@ class TestHiveServer(RMFTestCase):
                        config_file="default.json"
     )
     self.assert_configure_default()
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-exec-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-exec-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
     self.assertNoMoreResources()
   
@@ -55,21 +53,19 @@ class TestHiveServer(RMFTestCase):
     )
 
     self.assert_configure_default()
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-exec-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-exec-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
     self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /tmp/start_hiveserver2_script /var/log/hive/hive-server2.out /var/log/hive/hive-server2.log /var/run/hive/hive-server.pid /etc/hive/conf.server',
                               not_if = 'ls /var/run/hive/hive-server.pid >/dev/null 2>&1 && ps `cat /var/run/hive/hive-server.pid` >/dev/null 2>&1',
@@ -100,21 +96,19 @@ class TestHiveServer(RMFTestCase):
                        config_file="secured.json"
     )
     self.assert_configure_secured()
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-exec-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-exec-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
     self.assertNoMoreResources()
 
@@ -126,21 +120,19 @@ class TestHiveServer(RMFTestCase):
     )
 
     self.assert_configure_secured()
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-exec-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-exec-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
     self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /tmp/start_hiveserver2_script /var/log/hive/hive-server2.out /var/log/hive/hive-server2.log /var/run/hive/hive-server.pid /etc/hive/conf.server',
                               not_if = 'ls /var/run/hive/hive-server.pid >/dev/null 2>&1 && ps `cat /var/run/hive/hive-server.pid` >/dev/null 2>&1',

ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_client.py

@@ -42,13 +42,12 @@ class TestOozieClient(RMFTestCase):
     self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
       owner = 'oozie',
     )
-    self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
-      owner = 'oozie',
-      group = 'hadoop',
-      mode = 0664,
-      dir = '/etc/oozie/conf',
-      properties = self.getConfig()['configurations']['oozie-log4j'],
-    )
+    self.assertResourceCalled('File', '/etc/oozie/conf/oozie-log4j.properties',
+                              owner = 'oozie',
+                              group = 'hadoop',
+                              mode = 0644,
+                              content = 'log4jproperties\nline2'
+                              )
     self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
       owner = 'oozie',
       group = 'hadoop',
@@ -92,13 +91,12 @@ class TestOozieClient(RMFTestCase):
     self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
       owner = 'oozie',
     )
-    self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
-      owner = 'oozie',
-      group = 'hadoop',
-      mode = 0664,
-      dir = '/etc/oozie/conf',
-      properties = self.getConfig()['configurations']['oozie-log4j'],
-    )
+    self.assertResourceCalled('File', '/etc/oozie/conf/oozie-log4j.properties',
+                              owner = 'oozie',
+                              group = 'hadoop',
+                              mode = 0644,
+                              content = 'log4jproperties\nline2'
+                              )
     self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
       owner = 'oozie',
       group = 'hadoop',

ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_server.py

@@ -52,13 +52,12 @@ class TestOozieServer(RMFTestCase):
     self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
       owner = 'oozie',
     )
-    self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
-      owner = 'oozie',
-      group = 'hadoop',
-      mode = 0664,
-      dir = '/etc/oozie/conf',
-      properties = self.getConfig()['configurations']['oozie-log4j'],
-    )
+    self.assertResourceCalled('File', '/etc/oozie/conf/oozie-log4j.properties',
+                              owner = 'oozie',
+                              group = 'hadoop',
+                              mode = 0644,
+                              content = 'log4jproperties\nline2'
+                              )
     self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
       owner = 'oozie',
       group = 'hadoop',
@@ -190,13 +189,12 @@ class TestOozieServer(RMFTestCase):
     self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
       owner = 'oozie',
     )
-    self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
-      owner = 'oozie',
-      group = 'hadoop',
-      mode = 0664,
-      dir = '/etc/oozie/conf',
-      properties = self.getConfig()['configurations']['oozie-log4j'],
-    )
+    self.assertResourceCalled('File', '/etc/oozie/conf/oozie-log4j.properties',
+                              owner = 'oozie',
+                              group = 'hadoop',
+                              mode = 0644,
+                              content = 'log4jproperties\nline2'
+                              )
     self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
       owner = 'oozie',
       group = 'hadoop',
@@ -322,12 +320,11 @@ class TestOozieServer(RMFTestCase):
     self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
                               owner = 'oozie',
                               )
-    self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
+    self.assertResourceCalled('File', '/etc/oozie/conf/oozie-log4j.properties',
                               owner = 'oozie',
                               group = 'hadoop',
-                              mode = 0664,
-                              dir = '/etc/oozie/conf',
-                              properties = self.getConfig()['configurations']['oozie-log4j'],
+                              mode = 0644,
+                              content = 'log4jproperties\nline2'
                               )
     self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
                               owner = 'oozie',
@@ -418,12 +415,11 @@ class TestOozieServer(RMFTestCase):
     self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
                               owner = 'oozie',
                               )
-    self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
+    self.assertResourceCalled('File', '/etc/oozie/conf/oozie-log4j.properties',
                               owner = 'oozie',
                               group = 'hadoop',
-                              mode = 0664,
-                              dir = '/etc/oozie/conf',
-                              properties = self.getConfig()['configurations']['oozie-log4j'],
+                              mode = 0644,
+                              content = 'log4jproperties\nline2'
                               )
     self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
                               owner = 'oozie',

ambari-server/src/test/python/stacks/1.3.2/PIG/test_pig_client.py

@@ -20,7 +20,7 @@ limitations under the License.
 
 from stacks.utils.RMFTestCase import *
 
-class TestPigClient(RMFTestCase):
+class TestHcatClient(RMFTestCase):
 
   def test_configure_default(self):
     self.executeScript("1.3.2/services/PIG/package/scripts/pig_client.py",
@@ -28,6 +28,7 @@ class TestPigClient(RMFTestCase):
                        command = "configure",
                        config_file="default.json"
     )
+    
     self.assertResourceCalled('Directory', '/etc/pig/conf',
       owner = 'hdfs',
       group = 'hadoop',
@@ -38,23 +39,21 @@ class TestPigClient(RMFTestCase):
     self.assertResourceCalled('TemplateConfig', '/etc/pig/conf/pig.properties',
       owner = 'hdfs',
     )
-    self.assertResourceCalled('PropertiesFile', 'log4j.properties',
+    self.assertResourceCalled('File', '/etc/pig/conf/log4j.properties',
       owner = 'hdfs',
       group = 'hadoop',
-      mode = 0664,
-      dir = '/etc/pig/conf',
-      properties = self.getConfig()['configurations']['pig-log4j'],
+      mode = 0644,
+      content = 'log4jproperties\nline2'
     )
     self.assertNoMoreResources()
 
-
-
   def test_configure_secured(self):
     self.executeScript("1.3.2/services/PIG/package/scripts/pig_client.py",
                        classname = "PigClient",
                        command = "configure",
                        config_file="secured.json"
     )
+    
     self.assertResourceCalled('Directory', '/etc/pig/conf',
       owner = 'hdfs',
       group = 'hadoop',
@@ -65,11 +64,10 @@ class TestPigClient(RMFTestCase):
     self.assertResourceCalled('TemplateConfig', '/etc/pig/conf/pig.properties',
       owner = 'hdfs',
     )
-    self.assertResourceCalled('PropertiesFile', 'log4j.properties',
+    self.assertResourceCalled('File', '/etc/pig/conf/log4j.properties',
       owner = 'hdfs',
       group = 'hadoop',
-      mode = 0664,
-      dir = '/etc/pig/conf',
-      properties = self.getConfig()['configurations']['pig-log4j'],
+      mode = 0644,
+      content = 'log4jproperties\nline2'
     )
     self.assertNoMoreResources()

ambari-server/src/test/python/stacks/1.3.2/ZOOKEEPER/test_zookeeper_client.py

@@ -64,13 +64,12 @@ class TestZookeeperClient(RMFTestCase):
       group = 'hadoop',
       recursive = True,
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'log4j.properties',
-                              dir='/etc/zookeeper/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
-                              owner='zookeeper',
-                              group='hadoop'
+    self.assertResourceCalled('File',
+                              '/etc/zookeeper/conf/log4j.properties',
+                              content='log4jproperties\nline2',
+                              mode=0644,
+                              group='hadoop',
+                              owner='zookeeper'
     )
     self.assertResourceCalled('File', '/etc/zookeeper/conf/zoo_sample.cfg',
       owner = 'zookeeper',
@@ -121,13 +120,12 @@ class TestZookeeperClient(RMFTestCase):
       group = 'hadoop',
       recursive = True,
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'log4j.properties',
-                              dir='/etc/zookeeper/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
-                              owner='zookeeper',
-                              group='hadoop'
+    self.assertResourceCalled('File',
+                              '/etc/zookeeper/conf/log4j.properties',
+                              content='log4jproperties\nline2',
+                              mode=0644,
+                              group='hadoop',
+                              owner='zookeeper'
     )
     self.assertResourceCalled('File', '/etc/zookeeper/conf/zookeeper_client_jaas.conf',
       owner = 'zookeeper',

ambari-server/src/test/python/stacks/1.3.2/ZOOKEEPER/test_zookeeper_server.py

@@ -139,13 +139,12 @@ class TestZookeeperServer(RMFTestCase):
       content = '1',
       mode = 0644,
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'log4j.properties',
-                              dir='/etc/zookeeper/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
-                              owner='zookeeper',
-                              group='hadoop'
+    self.assertResourceCalled('File',
+                              '/etc/zookeeper/conf/log4j.properties',
+                              content='log4jproperties\nline2',
+                              mode=0644,
+                              group='hadoop',
+                              owner='zookeeper'
     )
     self.assertResourceCalled('File', '/etc/zookeeper/conf/zoo_sample.cfg',
       owner = 'zookeeper',
@@ -193,13 +192,12 @@ class TestZookeeperServer(RMFTestCase):
       content = '1',
       mode = 0644,
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'log4j.properties',
-                              dir='/etc/zookeeper/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
-                              owner='zookeeper',
-                              group='hadoop'
+    self.assertResourceCalled('File',
+                              '/etc/zookeeper/conf/log4j.properties',
+                              content='log4jproperties\nline2',
+                              mode=0644,
+                              group='hadoop',
+                              owner='zookeeper'
     )
     self.assertResourceCalled('File', '/etc/zookeeper/conf/zookeeper_jaas.conf',
       owner = 'zookeeper',

ambari-server/src/test/python/stacks/1.3.2/configs/default.json

@@ -351,28 +351,28 @@
             "hive.optimize.mapjoin.mapreduce": "true"
         },
         "hdfs-log4j": {
-            "property1": "value1"
+            "content": "log4jproperties\nline2"
         },
-        "yarn-log4j": {
-            "property1": "value1"
+        "mapreduce-log4j": {
+            "content": "log4jproperties\nline2"
         },
         "hbase-log4j": {
-            "property1": "value1"
+            "content": "log4jproperties\nline2"
         },
         "hive-log4j": {
-            "property1": "value1"
+            "content": "log4jproperties\nline2"
         },
         "hive-exec-log4j": {
-            "property1": "value1"
+            "content": "log4jproperties\nline2"
         },
         "zookeeper-log4j": {
-            "property1": "value1"
+            "content": "log4jproperties\nline2"
         },
         "pig-log4j": {
-            "property1": "value1"
+            "content": "log4jproperties\nline2"
         },
         "oozie-log4j": {
-            "property1": "value1"
+            "content": "log4jproperties\nline2"
         }
     }, 
     "configurationTags": {
@@ -399,6 +399,30 @@
         }, 
         "hive-site": {
             "tag": "version1"
+        },
+        "hdfs-log4j": {
+            "tag": "version1"
+        },
+        "yarn-log4j": {
+            "tag": "version1"
+        },
+        "hbase-log4j": {
+            "tag": "version1"
+        },
+        "hive-log4j": {
+            "tag": "version1"
+        },
+        "hive-exec-log4j": {
+            "tag": "version1"
+        },
+        "zookeeper-log4j": {
+            "tag": "version1"
+        },
+        "oozie-log4j": {
+            "tag": "version1"
+        },
+        "pig-log4j": {
+            "tag": "version1"
         }
     }, 
     "commandId": "1-1", 

ambari-server/src/test/python/stacks/1.3.2/configs/secured.json

@@ -456,28 +456,28 @@
             "hive.server2.authentication.kerberos.keytab": "/etc/security/keytabs/hive.service.keytab"
         },
         "hdfs-log4j": {
-            "property1": "value1"
+            "content": "log4jproperties\nline2"
         },
         "yarn-log4j": {
-            "property1": "value1"
+            "content": "log4jproperties\nline2"
         },
         "hbase-log4j": {
-            "property1": "value1"
+            "content": "log4jproperties\nline2"
         },
         "hive-log4j": {
-            "property1": "value1"
+            "content": "log4jproperties\nline2"
         },
         "hive-exec-log4j": {
-            "property1": "value1"
+            "content": "log4jproperties\nline2"
         },
         "zookeeper-log4j": {
-            "property1": "value1"
+            "content": "log4jproperties\nline2"
         },
         "pig-log4j": {
-            "property1": "value1"
+            "content": "log4jproperties\nline2"
         },
         "oozie-log4j": {
-            "property1": "value1"
+            "content": "log4jproperties\nline2"
         }
     }, 
     "configurationTags": {
@@ -504,6 +504,30 @@
         }, 
         "hive-site": {
             "tag": "version1389980437965"
+        },
+        "hdfs-log4j": {
+            "tag": "version1389980437965"
+        },
+        "yarn-log4j": {
+            "tag": "version1389980437965"
+        },
+        "hbase-log4j": {
+            "tag": "version1389980437965"
+        },
+        "hive-log4j": {
+            "tag": "version1389980437965"
+        },
+        "hive-exec-log4j": {
+            "tag": "version1389980437965"
+        },
+        "zookeeper-log4j": {
+            "tag": "version1389980437965"
+        },
+        "oozie-log4j": {
+            "tag": "version1389980437965"
+        },
+        "pig-log4j": {
+            "tag": "version1389980437965"
         }
     }, 
     "commandId": "4-2", 

ambari-server/src/test/python/stacks/1.3.2/hooks/before-START/test_before_start.py

@@ -96,36 +96,25 @@ class TestHookBeforeStart(RMFTestCase):
                               content = Template('health_check.j2'),
                               owner = 'hdfs',
                               )
-    self.assertResourceCalled('PropertiesFile',
+    rca_properties = format('''
+
+log4j.appender.JHA=org.apache.ambari.log4j.hadoop.mapreduce.jobhistory.JobHistoryAppender
+log4j.appender.JHA.database=jdbc:postgresql://c6401.ambari.apache.org/ambarirca
+log4j.appender.JHA.driver=org.postgresql.Driver
+log4j.appender.JHA.user=mapred
+log4j.appender.JHA.password=mapred
+
+log4j.logger.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger=DEBUG,JHA
+log4j.additivity.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger=true
+
+''')
+    self.maxDiff = None
+    self.assertResourceCalled('File',
                               '/etc/hadoop/conf/log4j.properties',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+                              mode=0644,
+                              group='hadoop',
                               owner='hdfs',
-                              group='hadoop'
-    )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?ambari.jobhistory.driver=.*~ambari.jobhistory.driver=org.postgresql.Driver~' /etc/hadoop/conf/log4j.properties",
-    )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?log4j.appender.JHA=.*~log4j.appender.JHA=org.apache.ambari.log4j.hadoop.mapreduce.jobhistory.JobHistoryAppender~' /etc/hadoop/conf/log4j.properties",
-    )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?log4j.appender.JHA.driver=.*~log4j.appender.JHA.driver=${ambari.jobhistory.driver}~' /etc/hadoop/conf/log4j.properties",
-    )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?log4j.appender.JHA.database=.*~log4j.appender.JHA.database=${ambari.jobhistory.database}~' /etc/hadoop/conf/log4j.properties",
-    )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?ambari.jobhistory.logger=.*~ambari.jobhistory.logger=DEBUG,JHA~' /etc/hadoop/conf/log4j.properties",
-    )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?log4j.appender.JHA.password=.*~log4j.appender.JHA.password=${ambari.jobhistory.password}~' /etc/hadoop/conf/log4j.properties",
-    )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?ambari.jobhistory.database=.*~ambari.jobhistory.database=jdbc:postgresql://c6401.ambari.apache.org/ambarirca~' /etc/hadoop/conf/log4j.properties",
-    )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?log4j.additivity.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger=.*~log4j.additivity.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger=true~' /etc/hadoop/conf/log4j.properties",
-    )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?log4j.logger.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger=.*~log4j.logger.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger=${ambari.jobhistory.logger}~' /etc/hadoop/conf/log4j.properties",
-    )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?log4j.appender.JHA.user=.*~log4j.appender.JHA.user=${ambari.jobhistory.user}~' /etc/hadoop/conf/log4j.properties",
-    )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?ambari.jobhistory.user=.*~ambari.jobhistory.user=mapred~' /etc/hadoop/conf/log4j.properties",
-    )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?ambari.jobhistory.password=.*~ambari.jobhistory.password=mapred~' /etc/hadoop/conf/log4j.properties",
+                              content='log4jproperties\nline2log4jproperties\nline2'+rca_properties
     )
     self.assertResourceCalled('File', '/etc/hadoop/conf/hadoop-metrics2.properties',
       content = Template('hadoop-metrics2.properties.j2'),
@@ -267,35 +256,11 @@ class TestHookBeforeStart(RMFTestCase):
                               content = Template('health_check.j2'),
                               owner = 'root',
                               )
-    self.assertResourceCalled('PropertiesFile', '/etc/hadoop/conf/log4j.properties',
+    self.assertResourceCalled('File', '/etc/hadoop/conf/log4j.properties',
                               owner = 'hdfs',
                               group = 'hadoop',
-                              mode = 0664,
-                              properties = self.getConfig()['configurations']['hdfs-log4j'],
-                              )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?ambari.jobhistory.driver=.*~ambari.jobhistory.driver=org.postgresql.Driver~' /etc/hadoop/conf/log4j.properties",
-                              )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?log4j.appender.JHA=.*~log4j.appender.JHA=org.apache.ambari.log4j.hadoop.mapreduce.jobhistory.JobHistoryAppender~' /etc/hadoop/conf/log4j.properties",
-                              )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?log4j.appender.JHA.driver=.*~log4j.appender.JHA.driver=${ambari.jobhistory.driver}~' /etc/hadoop/conf/log4j.properties",
-                              )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?log4j.appender.JHA.database=.*~log4j.appender.JHA.database=${ambari.jobhistory.database}~' /etc/hadoop/conf/log4j.properties",
-                              )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?ambari.jobhistory.logger=.*~ambari.jobhistory.logger=DEBUG,JHA~' /etc/hadoop/conf/log4j.properties",
-                              )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?log4j.appender.JHA.password=.*~log4j.appender.JHA.password=${ambari.jobhistory.password}~' /etc/hadoop/conf/log4j.properties",
-                              )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?ambari.jobhistory.database=.*~ambari.jobhistory.database=jdbc:postgresql://c6401.ambari.apache.org/ambarirca~' /etc/hadoop/conf/log4j.properties",
-                              )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?log4j.additivity.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger=.*~log4j.additivity.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger=true~' /etc/hadoop/conf/log4j.properties",
-                              )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?log4j.logger.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger=.*~log4j.logger.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger=${ambari.jobhistory.logger}~' /etc/hadoop/conf/log4j.properties",
-                              )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?log4j.appender.JHA.user=.*~log4j.appender.JHA.user=${ambari.jobhistory.user}~' /etc/hadoop/conf/log4j.properties",
-                              )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?ambari.jobhistory.user=.*~ambari.jobhistory.user=mapred~' /etc/hadoop/conf/log4j.properties",
-                              )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?ambari.jobhistory.password=.*~ambari.jobhistory.password=mapred~' /etc/hadoop/conf/log4j.properties",
+                              mode = 0644,
+                              content = 'log4jproperties\nline2'
                               )
     self.assertResourceCalled('File', '/etc/hadoop/conf/hadoop-metrics2.properties',
                               content = Template('hadoop-metrics2.properties.j2'),

ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py

@@ -71,13 +71,12 @@ class TestHBaseClient(RMFTestCase):
       owner = 'hbase',
       template_tag = None,
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'log4j.properties',
-                              dir='/etc/hbase/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hbase/conf/log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hbase',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
     self.assertNoMoreResources()
     
@@ -125,13 +124,12 @@ class TestHBaseClient(RMFTestCase):
       owner = 'hbase',
       template_tag = None,
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'log4j.properties',
-                              dir='/etc/hbase/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hbase/conf/log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hbase',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
     self.assertNoMoreResources()
     

ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py

@@ -236,13 +236,12 @@ class TestHBaseMaster(RMFTestCase):
       owner = 'hbase',
       recursive = True,
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'log4j.properties',
-                              dir='/etc/hbase/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hbase/conf/log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hbase',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
   
   def assert_configure_secured(self):
@@ -322,11 +321,10 @@ class TestHBaseMaster(RMFTestCase):
       owner = 'hbase',
       recursive = True,
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'log4j.properties',
-                              dir='/etc/hbase/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hbase/conf/log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hbase',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )

ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py

@@ -169,13 +169,12 @@ class TestHbaseRegionServer(RMFTestCase):
       owner = 'hbase',
       recursive = True,
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'log4j.properties',
-                              dir='/etc/hbase/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hbase/conf/log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hbase',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
   
   def assert_configure_secured(self):
@@ -255,11 +254,10 @@ class TestHbaseRegionServer(RMFTestCase):
       owner = 'hbase',
       recursive = True,
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'log4j.properties',
-                              dir='/etc/hbase/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hbase/conf/log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hbase',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )

ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py

@@ -57,21 +57,19 @@ class TestHiveClient(RMFTestCase):
       owner = 'hive',
       group = 'hadoop',
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-exec-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-exec-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
     self.assertNoMoreResources()
 
@@ -112,20 +110,18 @@ class TestHiveClient(RMFTestCase):
       owner = 'hive',
       group = 'hadoop',
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-exec-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-exec-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
     self.assertNoMoreResources()

ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py

@@ -38,21 +38,19 @@ class TestHiveMetastore(RMFTestCase):
     )
 
     self.assert_configure_default()
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-exec-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-exec-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
     self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /tmp/start_metastore_script /var/log/hive/hive.out /var/log/hive/hive.log /var/run/hive/hive.pid /etc/hive/conf.server',
                               not_if = 'ls /var/run/hive/hive.pid >/dev/null 2>&1 && ps `cat /var/run/hive/hive.pid` >/dev/null 2>&1',
@@ -82,21 +80,19 @@ class TestHiveMetastore(RMFTestCase):
                        config_file="secured.json"
     )
     self.assert_configure_default()
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-exec-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-exec-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
     self.assertNoMoreResources()
 
@@ -108,21 +104,19 @@ class TestHiveMetastore(RMFTestCase):
     )
 
     self.assert_configure_secured()
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-exec-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-exec-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
     self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /tmp/start_metastore_script /var/log/hive/hive.out /var/log/hive/hive.log /var/run/hive/hive.pid /etc/hive/conf.server',
                               not_if = 'ls /var/run/hive/hive.pid >/dev/null 2>&1 && ps `cat /var/run/hive/hive.pid` >/dev/null 2>&1',

ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py

@@ -29,21 +29,19 @@ class TestHiveServer(RMFTestCase):
                        config_file="default.json"
     )
     self.assert_configure_default()
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-exec-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-exec-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
     self.assertNoMoreResources()
   
@@ -55,21 +53,19 @@ class TestHiveServer(RMFTestCase):
     )
 
     self.assert_configure_default()
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-exec-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-exec-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
 
     self.assertResourceCalled('HdfsDirectory', '/apps/tez/',
@@ -150,21 +146,19 @@ class TestHiveServer(RMFTestCase):
                        config_file="secured.json"
     )
     self.assert_configure_secured()
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-exec-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-exec-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
     self.assertNoMoreResources()
 
@@ -176,21 +170,19 @@ class TestHiveServer(RMFTestCase):
     )
 
     self.assert_configure_secured()
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-exec-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-exec-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'hive-log4j.properties',
-                              dir='/etc/hive/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+    self.assertResourceCalled('File',
+                              '/etc/hive/conf/hive-log4j.properties',
+                              mode=0644,
+                              group='hadoop',
                               owner='hive',
-                              group='hadoop'
+                              content='log4jproperties\nline2'
     )
     self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /tmp/start_hiveserver2_script /var/log/hive/hive-server2.out /var/log/hive/hive-server2.log /var/run/hive/hive-server.pid /etc/hive/conf.server',
                               not_if = 'ls /var/run/hive/hive-server.pid >/dev/null 2>&1 && ps `cat /var/run/hive/hive-server.pid` >/dev/null 2>&1',

ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py

@@ -45,13 +45,12 @@ class TestOozieClient(RMFTestCase):
     self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
         owner = 'oozie',
         )
-    self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
-        owner = 'oozie',
-        group = 'hadoop',
-        mode = 0664,
-        dir = '/etc/oozie/conf',
-        properties = self.getConfig()['configurations']['oozie-log4j'],
-        )
+    self.assertResourceCalled('File', '/etc/oozie/conf/oozie-log4j.properties',
+                              owner = 'oozie',
+                              group = 'hadoop',
+                              mode = 0644,
+                              content = 'log4jproperties\nline2'
+                              )
     self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
         owner = 'oozie',
         group = 'hadoop',
@@ -98,12 +97,11 @@ class TestOozieClient(RMFTestCase):
     self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
                               owner = 'oozie',
                               )
-    self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
+    self.assertResourceCalled('File', '/etc/oozie/conf/oozie-log4j.properties',
                               owner = 'oozie',
                               group = 'hadoop',
-                              mode = 0664,
-                              dir = '/etc/oozie/conf',
-                              properties = self.getConfig()['configurations']['oozie-log4j'],
+                              mode = 0644,
+                              content = 'log4jproperties\nline2'
                               )
     self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
                               owner = 'oozie',

ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py

@@ -138,12 +138,11 @@ class TestOozieServer(RMFTestCase):
     self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
                               owner = 'oozie',
                               )
-    self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
+    self.assertResourceCalled('File', '/etc/oozie/conf/oozie-log4j.properties',
                               owner = 'oozie',
                               group = 'hadoop',
-                              mode = 0664,
-                              dir = '/etc/oozie/conf',
-                              properties = self.getConfig()['configurations']['oozie-log4j'],
+                              mode = 0644,
+                              content = 'log4jproperties\nline2'
                               )
     self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
                               owner = 'oozie',
@@ -238,12 +237,11 @@ class TestOozieServer(RMFTestCase):
     self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
                               owner = 'oozie',
                               )
-    self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
+    self.assertResourceCalled('File', '/etc/oozie/conf/oozie-log4j.properties',
                               owner = 'oozie',
                               group = 'hadoop',
-                              mode = 0664,
-                              dir = '/etc/oozie/conf',
-                              properties = self.getConfig()['configurations']['oozie-log4j'],
+                              mode = 0644,
+                              content = 'log4jproperties\nline2'
                               )
     self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
                               owner = 'oozie',

ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_client.py

@@ -20,7 +20,7 @@ limitations under the License.
 
 from stacks.utils.RMFTestCase import *
 
-class TestPigClient(RMFTestCase):
+class TestHcatClient(RMFTestCase):
 
   def test_configure_default(self):
     self.executeScript("2.0.6/services/PIG/package/scripts/pig_client.py",
@@ -28,6 +28,7 @@ class TestPigClient(RMFTestCase):
                        command = "configure",
                        config_file="default.json"
     )
+
     self.assertResourceCalled('Directory', '/etc/pig/conf',
       owner = 'hdfs',
       group = 'hadoop',
@@ -38,21 +39,21 @@ class TestPigClient(RMFTestCase):
     self.assertResourceCalled('TemplateConfig', '/etc/pig/conf/pig.properties',
       owner = 'hdfs',
     )
-    self.assertResourceCalled('PropertiesFile', 'log4j.properties',
+    self.assertResourceCalled('File', '/etc/pig/conf/log4j.properties',
       owner = 'hdfs',
       group = 'hadoop',
-      mode = 0664,
-      dir = '/etc/pig/conf',
-      properties = self.getConfig()['configurations']['pig-log4j'],
+      mode = 0644,
+      content = 'log4jproperties\nline2'
     )
     self.assertNoMoreResources()
-    
+
   def test_configure_secured(self):
     self.executeScript("2.0.6/services/PIG/package/scripts/pig_client.py",
                        classname = "PigClient",
                        command = "configure",
                        config_file="secured.json"
     )
+    
     self.assertResourceCalled('Directory', '/etc/pig/conf',
       owner = 'hdfs',
       group = 'hadoop',
@@ -63,11 +64,10 @@ class TestPigClient(RMFTestCase):
     self.assertResourceCalled('TemplateConfig', '/etc/pig/conf/pig.properties',
       owner = 'hdfs',
     )
-    self.assertResourceCalled('PropertiesFile', 'log4j.properties',
+    self.assertResourceCalled('File', '/etc/pig/conf/log4j.properties',
       owner = 'hdfs',
       group = 'hadoop',
-      mode = 0664,
-      dir = '/etc/pig/conf',
-      properties = self.getConfig()['configurations']['pig-log4j'],
+      mode = 0644,
+      content = 'log4jproperties\nline2'
     )
     self.assertNoMoreResources()

ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py

@@ -65,13 +65,12 @@ class TestZookeeperClient(RMFTestCase):
       group = 'hadoop',
       recursive = True,
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'log4j.properties',
-                              dir='/etc/zookeeper/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
-                              owner='zookeeper',
-                              group='hadoop'
+    self.assertResourceCalled('File',
+                              '/etc/zookeeper/conf/log4j.properties',
+                              content='log4jproperties\nline2',
+                              mode=0644,
+                              group='hadoop',
+                              owner='zookeeper'
     )
     self.assertResourceCalled('File', '/etc/zookeeper/conf/zoo_sample.cfg',
       owner = 'zookeeper',
@@ -122,13 +121,12 @@ class TestZookeeperClient(RMFTestCase):
       group = 'hadoop',
       recursive = True,
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'log4j.properties',
-                              dir='/etc/zookeeper/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
-                              owner='zookeeper',
-                              group='hadoop'
+    self.assertResourceCalled('File',
+                              '/etc/zookeeper/conf/log4j.properties',
+                              content='log4jproperties\nline2',
+                              mode=0644,
+                              group='hadoop',
+                              owner='zookeeper'
     )
     self.assertResourceCalled('File', '/etc/zookeeper/conf/zookeeper_client_jaas.conf',
       owner = 'zookeeper',

ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py

@@ -136,13 +136,12 @@ class TestZookeeperServer(RMFTestCase):
       content = '1',
       mode = 0644,
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'log4j.properties',
-                              dir='/etc/zookeeper/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
-                              owner='zookeeper',
-                              group='hadoop'
+    self.assertResourceCalled('File',
+                              '/etc/zookeeper/conf/log4j.properties',
+                              content='log4jproperties\nline2',
+                              mode=0644,
+                              group='hadoop',
+                              owner='zookeeper'
     )
     self.assertResourceCalled('File', '/etc/zookeeper/conf/zoo_sample.cfg',
       owner = 'zookeeper',
@@ -189,13 +188,12 @@ class TestZookeeperServer(RMFTestCase):
       content = '1',
       mode = 0644,
     )
-    self.assertResourceCalled('PropertiesFile',
-                              'log4j.properties',
-                              dir='/etc/zookeeper/conf',
-                              properties={'property1': 'value1'},
-                              mode=0664,
-                              owner='zookeeper',
-                              group='hadoop'
+    self.assertResourceCalled('File',
+                              '/etc/zookeeper/conf/log4j.properties',
+                              content='log4jproperties\nline2',
+                              mode=0644,
+                              group='hadoop',
+                              owner='zookeeper'
     )
     self.assertResourceCalled('File', '/etc/zookeeper/conf/zookeeper_jaas.conf',
       owner = 'zookeeper',

ambari-server/src/test/python/stacks/2.0.6/configs/default.json

@@ -491,28 +491,28 @@
             "tez.am.am-rm.heartbeat.interval-ms.max": "250"
         },
         "hdfs-log4j": {
-            "property1": "value1"
+            "content": "log4jproperties\nline2"
         },
         "yarn-log4j": {
-            "property1": "value1"
+            "content": "log4jproperties\nline2"
         },
         "hbase-log4j": {
-            "property1": "value1"
+            "content": "log4jproperties\nline2"
         },
         "hive-log4j": {
-            "property1": "value1"
+            "content": "log4jproperties\nline2"
         },
         "hive-exec-log4j": {
-            "property1": "value1"
+            "content": "log4jproperties\nline2"
         },
         "zookeeper-log4j": {
-            "property1": "value1"
+            "content": "log4jproperties\nline2"
         },
         "pig-log4j": {
-            "property1": "value1"
+            "content": "log4jproperties\nline2"
         },
         "oozie-log4j": {
-            "property1": "value1"
+            "content": "log4jproperties\nline2"
         }
     },
     "configurationTags": {
@@ -566,6 +566,12 @@
         },
         "zookeeper-log4j": {
             "tag": "version1"
+        },
+        "oozie-log4j": {
+            "tag": "version1"
+        },
+        "pig-log4j": {
+            "tag": "version1"
         }
     }, 
     "commandId": "7-1", 

ambari-server/src/test/python/stacks/2.0.6/configs/secured.json

@@ -618,28 +618,28 @@
             "yarn.nodemanager.aux-services.mapreduce_shuffle.class": "org.apache.hadoop.mapred.ShuffleHandler"
         },
         "hdfs-log4j": {
-            "property1": "value1"
+            "content": "log4jproperties\nline2"
         },
         "yarn-log4j": {
-            "property1": "value1"
+            "content": "log4jproperties\nline2"
         },
         "hbase-log4j": {
-            "property1": "value1"
+            "content": "log4jproperties\nline2"
         },
         "hive-log4j": {
-            "property1": "value1"
+            "content": "log4jproperties\nline2"
         },
         "hive-exec-log4j": {
-            "property1": "value1"
+            "content": "log4jproperties\nline2"
         },
         "zookeeper-log4j": {
-            "property1": "value1"
+            "content": "log4jproperties\nline2"
         },
         "pig-log4j": {
-            "property1": "value1"
+            "content": "log4jproperties\nline2"
         },
         "oozie-log4j": {
-            "property1": "value1"
+            "content": "log4jproperties\nline2"
         }
     }, 
     "configurationTags": {
@@ -693,8 +693,13 @@
         },
         "zookeeper-log4j": {
             "tag": "version1389972945450"
+        },
+        "oozie-log4j": {
+            "tag": "version1389972945450"
+        },
+        "pig-log4j": {
+            "tag": "version1389972945450"
         }
-
     },
     "commandId": "9-1", 
     "clusterHostInfo": {

ambari-server/src/test/python/stacks/2.0.6/hooks/before-START/test_before_start.py

@@ -100,36 +100,12 @@ class TestHookBeforeStart(RMFTestCase):
                               content = Template('health_check-v2.j2'),
                               owner = 'hdfs',
                               )
-    self.assertResourceCalled('PropertiesFile',
+    self.assertResourceCalled('File',
                               '/etc/hadoop/conf/log4j.properties',
-                              properties={'property1': 'value1'},
-                              mode=0664,
+                              mode=0644,
+                              group='hadoop',
                               owner='hdfs',
-                              group='hadoop'
-    )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?ambari.jobhistory.driver=.*~###ambari.jobhistory.driver=o~' /etc/hadoop/conf/log4j.properties",
-                              )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?log4j.appender.JHA=.*~###log4j.appender.JHA=org.apache.ambari.log4j.hadoop.mapreduce.jobhistory.JobHistoryAppender~' /etc/hadoop/conf/log4j.properties",
-                              )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?log4j.appender.JHA.driver=.*~###log4j.appender.JHA.driver=${ambari.jobhistory.driver}~' /etc/hadoop/conf/log4j.properties",
-                              )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?log4j.appender.JHA.database=.*~###log4j.appender.JHA.database=${ambari.jobhistory.database}~' /etc/hadoop/conf/log4j.properties",
-                              )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?ambari.jobhistory.logger=.*~###ambari.jobhistory.logger=DEBUG,JHA~' /etc/hadoop/conf/log4j.properties",
-                              )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?log4j.appender.JHA.password=.*~###log4j.appender.JHA.password=${ambari.jobhistory.password}~' /etc/hadoop/conf/log4j.properties",
-                              )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?ambari.jobhistory.database=.*~###ambari.jobhistory.database=j~' /etc/hadoop/conf/log4j.properties",
-                              )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?log4j.additivity.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger=.*~###log4j.additivity.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger=true~' /etc/hadoop/conf/log4j.properties",
-                              )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?log4j.logger.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger=.*~###log4j.logger.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger=${ambari.jobhistory.logger}~' /etc/hadoop/conf/log4j.properties",
-                              )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?log4j.appender.JHA.user=.*~###log4j.appender.JHA.user=${ambari.jobhistory.user}~' /etc/hadoop/conf/log4j.properties",
-                              )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?ambari.jobhistory.user=.*~###ambari.jobhistory.user=m~' /etc/hadoop/conf/log4j.properties",
-                              )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?ambari.jobhistory.password=.*~###ambari.jobhistory.password=m~' /etc/hadoop/conf/log4j.properties",
+                              content='log4jproperties\nline2log4jproperties\nline2'
                               )
     self.assertResourceCalled('File', '/etc/hadoop/conf/hadoop-metrics2.properties',
                               content = Template('hadoop-metrics2.properties.j2'),
@@ -278,35 +254,12 @@ class TestHookBeforeStart(RMFTestCase):
                               content = Template('health_check-v2.j2'),
                               owner = 'root',
                               )
-    self.assertResourceCalled('PropertiesFile', '/etc/hadoop/conf/log4j.properties',
-                              owner = 'hdfs',
-                              group = 'hadoop',
-                              mode = 0664,
-                              properties = self.getConfig()['configurations']['hdfs-log4j'],
-                              )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?ambari.jobhistory.driver=.*~###ambari.jobhistory.driver=o~' /etc/hadoop/conf/log4j.properties",
-                              )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?log4j.appender.JHA=.*~###log4j.appender.JHA=org.apache.ambari.log4j.hadoop.mapreduce.jobhistory.JobHistoryAppender~' /etc/hadoop/conf/log4j.properties",
-                              )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?log4j.appender.JHA.driver=.*~###log4j.appender.JHA.driver=${ambari.jobhistory.driver}~' /etc/hadoop/conf/log4j.properties",
-                              )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?log4j.appender.JHA.database=.*~###log4j.appender.JHA.database=${ambari.jobhistory.database}~' /etc/hadoop/conf/log4j.properties",
-                              )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?ambari.jobhistory.logger=.*~###ambari.jobhistory.logger=DEBUG,JHA~' /etc/hadoop/conf/log4j.properties",
-                              )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?log4j.appender.JHA.password=.*~###log4j.appender.JHA.password=${ambari.jobhistory.password}~' /etc/hadoop/conf/log4j.properties",
-                              )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?ambari.jobhistory.database=.*~###ambari.jobhistory.database=j~' /etc/hadoop/conf/log4j.properties",
-                              )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?log4j.additivity.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger=.*~###log4j.additivity.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger=true~' /etc/hadoop/conf/log4j.properties",
-                              )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?log4j.logger.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger=.*~###log4j.logger.org.apache.hadoop.mapred.JobHistory$JobHistoryLogger=${ambari.jobhistory.logger}~' /etc/hadoop/conf/log4j.properties",
-                              )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?log4j.appender.JHA.user=.*~###log4j.appender.JHA.user=${ambari.jobhistory.user}~' /etc/hadoop/conf/log4j.properties",
-                              )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?ambari.jobhistory.user=.*~###ambari.jobhistory.user=m~' /etc/hadoop/conf/log4j.properties",
-                              )
-    self.assertResourceCalled('Execute', "sed -i 's~\\(###\\)\\?ambari.jobhistory.password=.*~###ambari.jobhistory.password=m~' /etc/hadoop/conf/log4j.properties",
+    self.assertResourceCalled('File',
+                              '/etc/hadoop/conf/log4j.properties',
+                              mode=0644,
+                              group='hadoop',
+                              owner='hdfs',
+                              content='log4jproperties\nline2log4jproperties\nline2'
                               )
     self.assertResourceCalled('File', '/etc/hadoop/conf/hadoop-metrics2.properties',
                               content = Template('hadoop-metrics2.properties.j2'),
@@ -364,4 +317,4 @@ class TestHookBeforeStart(RMFTestCase):
                               owner = 'mapred',
                               group = 'hadoop',
                               )
-    self.assertNoMoreResources()
+    self.assertNoMoreResources()