AMBARI-12964. update log4j file name to match updated file name in atlas service (Jon Maron via smohanty)

ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml

@@ -42,7 +42,7 @@
   </property>
   <property>
     <name>metadata_opts</name>
-    <value>-Xmx1024m</value>
+    <value>-Xmx1024m -Dlog4j.configuration=atlas-log4j.xml</value>
     <description>Metadata Server command line options.</description>
   </property>
   <property>
@@ -70,7 +70,7 @@
 export JAVA_HOME={{java64_home}}
 
 # any additional java opts you want to set. This will apply to both client and server operations
-export METADATA_OPTS={{metadata_opts}}
+export METADATA_OPTS="{{metadata_opts}}"
 
 # metadata configuration directory 
 export METADATA_CONF={{conf_dir}}

ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py

@@ -83,9 +83,9 @@ def metadata():
          content=InlineTemplate(params.metadata_env_content)
     )
 
-    File(format("{conf_dir}/log4j.xml"),
+    File(format("{conf_dir}/atlas-log4j.xml"),
          mode=0644,
          owner=params.metadata_user,
          group=params.user_group,
-         content=StaticFile('log4j.xml')
+         content=StaticFile('atlas-log4j.xml')
     )

ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py

@@ -89,8 +89,8 @@ class TestMetadataServer(RMFTestCase):
                                 group='hadoop',
                                 mode=0755,
       )
-      self.assertResourceCalled('File', '/etc/atlas/conf/log4j.xml',
-                                content=StaticFile('log4j.xml'),
+      self.assertResourceCalled('File', '/etc/atlas/conf/atlas-log4j.xml',
+                                content=StaticFile('atlas-log4j.xml'),
                                 owner='atlas',
                                 group='hadoop',
                                 mode=0644,