Przeglądaj źródła

AMBARI-11058 - Check oozie.https properties to generate oozie war -secure (tbeerbower)

tbeerbower 10 lat temu
rodzic
commit
bb9963c783

+ 1 - 1
ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py

@@ -139,7 +139,7 @@ oozie_log_dir = config['configurations']['oozie-env']['oozie_log_dir']
 oozie_data_dir = config['configurations']['oozie-env']['oozie_data_dir']
 oozie_data_dir = config['configurations']['oozie-env']['oozie_data_dir']
 oozie_server_port = get_port_from_url(config['configurations']['oozie-site']['oozie.base.url'])
 oozie_server_port = get_port_from_url(config['configurations']['oozie-site']['oozie.base.url'])
 oozie_server_admin_port = config['configurations']['oozie-env']['oozie_admin_port']
 oozie_server_admin_port = config['configurations']['oozie-env']['oozie_admin_port']
-if config['configurations']['oozie-site']['oozie.base.url'].startswith('https'):
+if 'oozie.https.port' in config['configurations']['oozie-site'] or 'oozie.https.keystore.file' in config['configurations']['oozie-site'] or 'oozie.https.keystore.pass' in config['configurations']['oozie-site']:
   oozie_secure = '-secure'
   oozie_secure = '-secure'
 else:
 else:
   oozie_secure = ''
   oozie_secure = ''

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

@@ -97,7 +97,7 @@
             "oozie.service.ActionService.executor.ext.classes": "\n            org.apache.oozie.action.email.EmailActionExecutor,\n            org.apache.oozie.action.hadoop.HiveActionExecutor,\n            org.apache.oozie.action.hadoop.ShellActionExecutor,\n            org.apache.oozie.action.hadoop.SqoopActionExecutor,\n            org.apache.oozie.action.hadoop.DistcpActionExecutor", 
             "oozie.service.ActionService.executor.ext.classes": "\n            org.apache.oozie.action.email.EmailActionExecutor,\n            org.apache.oozie.action.hadoop.HiveActionExecutor,\n            org.apache.oozie.action.hadoop.ShellActionExecutor,\n            org.apache.oozie.action.hadoop.SqoopActionExecutor,\n            org.apache.oozie.action.hadoop.DistcpActionExecutor", 
             "oozie.service.HadoopAccessorService.kerberos.principal": "oozie/c6402.ambari.apache.org@EXAMPLE.COM", 
             "oozie.service.HadoopAccessorService.kerberos.principal": "oozie/c6402.ambari.apache.org@EXAMPLE.COM", 
             "oozie.service.AuthorizationService.authorization.enabled": "true", 
             "oozie.service.AuthorizationService.authorization.enabled": "true", 
-            "oozie.base.url": "https://c6402.ambari.apache.org:11000/oozie",
+            "oozie.base.url": "http://c6402.ambari.apache.org:11000/oozie",
             "oozie.service.JPAService.jdbc.password": "asd", 
             "oozie.service.JPAService.jdbc.password": "asd", 
             "oozie.service.coord.normal.default.timeout": "120", 
             "oozie.service.coord.normal.default.timeout": "120", 
             "oozie.service.AuthorizationService.security.enabled": "true", 
             "oozie.service.AuthorizationService.security.enabled": "true", 
@@ -117,7 +117,10 @@
             "oozie.service.URIHandlerService.uri.handlers": "org.apache.oozie.dependency.FSURIHandler,org.apache.oozie.dependency.HCatURIHandler", 
             "oozie.service.URIHandlerService.uri.handlers": "org.apache.oozie.dependency.FSURIHandler,org.apache.oozie.dependency.HCatURIHandler", 
             "oozie.authentication.type": "kerberos", 
             "oozie.authentication.type": "kerberos", 
             "oozie.authentication.kerberos.principal": "HTTP/c6402.ambari.apache.org@EXAMPLE.COM", 
             "oozie.authentication.kerberos.principal": "HTTP/c6402.ambari.apache.org@EXAMPLE.COM", 
-            "oozie.system.id": "oozie-${user.name}"
+            "oozie.system.id": "oozie-${user.name}",
+            "oozie.https.port": "11443",
+            "oozie.https.keystore.file": "/home/oozie/oozie.keystore",
+            "oozie.https.keystore.pass": "password"
         }, 
         }, 
         "storm-site": {
         "storm-site": {
             "topology.tuple.serializer": "backtype.storm.serialization.types.ListDelegateSerializer", 
             "topology.tuple.serializer": "backtype.storm.serialization.types.ListDelegateSerializer",