AMBARI-6844. Falcon-oozie configuration issues (aonishuk)

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

@@ -31,12 +31,9 @@ def oozie(is_server=False # TODO: see if see can remove this
                          owner=params.oozie_user,
                          mode=params.oozie_hdfs_user_mode
     )
-  #TODO hack for falcon el
-  oozie_site = dict(params.config['configurations']['oozie-site'])
-  oozie_site["oozie.services.ext"] = 'org.apache.oozie.service.JMSAccessorService,' + oozie_site["oozie.services.ext"]
   XmlConfig( "oozie-site.xml",
-    conf_dir = params.conf_dir, 
-    configurations = oozie_site,
+    conf_dir = params.conf_dir,
+    configurations = params.config['configurations']['oozie-site'],
     configuration_attributes=params.config['configuration_attributes']['oozie-site'],
     owner = params.oozie_user,
     group = params.user_group,

ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/metainfo.xml

@@ -86,16 +86,11 @@
       </commandScript>
 
       <configuration-dependencies>
-        <config-type>oozie-site</config-type>
         <config-type>falcon-env</config-type>
         <config-type>falcon-startup.properties</config-type>
         <config-type>falcon-runtime.properties</config-type>
       </configuration-dependencies>
 
-      <excluded-config-types>
-        <config-type>oozie-site</config-type>
-      </excluded-config-types>
-
     </service>
   </services>
 </metainfo>

ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml

@@ -288,7 +288,7 @@
   </property>
   <property>
     <name>oozie.services.ext</name>
-    <value>org.apache.oozie.service.PartitionDependencyManagerService,org.apache.oozie.service.HCatAccessorService
+    <value>org.apache.oozie.service.JMSAccessorService,org.apache.oozie.service.PartitionDependencyManagerService,org.apache.oozie.service.HCatAccessorService
     </value>
     <description>
       To add/replace services defined in 'oozie.services' with custom implementations.

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

@@ -28,17 +28,13 @@ class TestOozieClient(RMFTestCase):
                        command = "configure",
                        config_file="default.json"
     )
-    # Hack for oozie.py changing conf on fly
-    oozie_site = self.getConfig()['configurations']['oozie-site'].copy()
-    oozie_site_attrs = self.getConfig()['configuration_attributes']['oozie-site'].copy()
-    oozie_site["oozie.services.ext"] = 'org.apache.oozie.service.JMSAccessorService,' + oozie_site["oozie.services.ext"]
     self.assertResourceCalled('XmlConfig', 'oozie-site.xml',
                               owner = 'oozie',
                               group = 'hadoop',
                               mode = 0664,
                               conf_dir = '/etc/oozie/conf',
-                              configurations = oozie_site,
-                              configuration_attributes = oozie_site_attrs
+                              configurations = self.getConfig()['configurations']['oozie-site'],
+                              configuration_attributes = self.getConfig()['configuration_attributes']['oozie-site']
                               )
     self.assertResourceCalled('Directory', '/etc/oozie/conf',
         owner = 'oozie',
@@ -83,17 +79,13 @@ class TestOozieClient(RMFTestCase):
                        command = "configure",
                        config_file="secured.json"
     )
-    # Hack for oozie.py changing conf on fly
-    oozie_site = self.getConfig()['configurations']['oozie-site'].copy()
-    oozie_site_attrs = self.getConfig()['configuration_attributes']['oozie-site'].copy()
-    oozie_site["oozie.services.ext"] = 'org.apache.oozie.service.JMSAccessorService,' + oozie_site["oozie.services.ext"]
     self.assertResourceCalled('XmlConfig', 'oozie-site.xml',
                               owner = 'oozie',
                               group = 'hadoop',
                               mode = 0664,
                               conf_dir = '/etc/oozie/conf',
-                              configurations = oozie_site,
-                              configuration_attributes = oozie_site_attrs
+                              configurations = self.getConfig()['configurations']['oozie-site'],
+                              configuration_attributes = self.getConfig()['configuration_attributes']['oozie-site']
                               )
     self.assertResourceCalled('Directory', '/etc/oozie/conf',
                               owner = 'oozie',

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

@@ -114,10 +114,6 @@ class TestOozieServer(RMFTestCase):
 
 
   def assert_configure_default(self):
-    # Hack for oozie.py changing conf on fly
-    oozie_site = self.getConfig()['configurations']['oozie-site'].copy()
-    oozie_site_attrs = self.getConfig()['configuration_attributes']['oozie-site'].copy()
-    oozie_site["oozie.services.ext"] = 'org.apache.oozie.service.JMSAccessorService,' + oozie_site["oozie.services.ext"]
     self.assertResourceCalled('HdfsDirectory', '/user/oozie',
                               security_enabled = False,
                               keytab = UnknownConfigurationMock(),
@@ -133,8 +129,8 @@ class TestOozieServer(RMFTestCase):
                               group = 'hadoop',
                               mode = 0664,
                               conf_dir = '/etc/oozie/conf',
-                              configurations = oozie_site,
-                              configuration_attributes = oozie_site_attrs
+                              configurations = self.getConfig()['configurations']['oozie-site'],
+                              configuration_attributes = self.getConfig()['configuration_attributes']['oozie-site']
                               )
     self.assertResourceCalled('Directory', '/etc/oozie/conf',
                               owner = 'oozie',
@@ -220,10 +216,6 @@ class TestOozieServer(RMFTestCase):
 
 
   def assert_configure_secured(self):
-    # Hack for oozie.py changing conf on fly
-    oozie_site = self.getConfig()['configurations']['oozie-site'].copy()
-    oozie_site_attrs = self.getConfig()['configuration_attributes']['oozie-site'].copy()
-    oozie_site["oozie.services.ext"] = 'org.apache.oozie.service.JMSAccessorService,' + oozie_site["oozie.services.ext"]
     self.assertResourceCalled('HdfsDirectory', '/user/oozie',
                               security_enabled = True,
                               keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -239,8 +231,8 @@ class TestOozieServer(RMFTestCase):
                               group = 'hadoop',
                               mode = 0664,
                               conf_dir = '/etc/oozie/conf',
-                              configurations = oozie_site,
-                              configuration_attributes = oozie_site_attrs
+                              configurations = self.getConfig()['configurations']['oozie-site'],
+                              configuration_attributes = self.getConfig()['configuration_attributes']['oozie-site']
                               )
     self.assertResourceCalled('Directory', '/etc/oozie/conf',
                               owner = 'oozie',

ambari-web/app/data/HDP2/site_properties.js

@@ -1212,7 +1212,7 @@ module.exports =
   /*********************************************oozie-site for Falcon*****************************/
     {
       "id": "site property",
-      "isReconfigurable": false,
+      "isReconfigurable": true,
       "serviceName": "FALCON",
       "category": "Falcon - Oozie integration",
       "displayName": "oozie.service.ELService.ext.functions.coord-job-submit-instances",
@@ -1222,7 +1222,7 @@ module.exports =
     },
     {
       "id": "site property",
-      "isReconfigurable": false,
+      "isReconfigurable": true,
       "serviceName": "FALCON",
       "category": "Falcon - Oozie integration",
       "displayName": "oozie.service.ELService.ext.functions.coord-action-create-inst",
@@ -1232,7 +1232,7 @@ module.exports =
     },
     {
       "id": "site property",
-      "isReconfigurable": false,
+      "isReconfigurable": true,
       "serviceName": "FALCON",
       "category": "Falcon - Oozie integration",
       "displayName": "oozie.service.ELService.ext.functions.coord-action-create",
@@ -1242,7 +1242,7 @@ module.exports =
     },
     {
       "id": "site property",
-      "isReconfigurable": false,
+      "isReconfigurable": true,
       "serviceName": "FALCON",
       "category": "Falcon - Oozie integration",
       "displayName": "oozie.service.ELService.ext.functions.coord-job-submit-data",
@@ -1252,7 +1252,7 @@ module.exports =
     },
     {
       "id": "site property",
-      "isReconfigurable": false,
+      "isReconfigurable": true,
       "serviceName": "FALCON",
       "category": "Falcon - Oozie integration",
       "displayName": "oozie.service.ELService.ext.functions.coord-action-start",
@@ -1262,7 +1262,7 @@ module.exports =
     },
     {
       "id": "site property",
-      "isReconfigurable": false,
+      "isReconfigurable": true,
       "serviceName": "FALCON",
       "category": "Falcon - Oozie integration",
       "displayName": "oozie.service.ELService.ext.functions.coord-sla-submit",
@@ -1272,7 +1272,7 @@ module.exports =
     },
     {
       "id": "site property",
-      "isReconfigurable": false,
+      "isReconfigurable": true,
       "serviceName": "FALCON",
       "category": "Falcon - Oozie integration",
       "displayName": "oozie.service.ELService.ext.functions.coord-sla-create",