Revert "AMBARI-17607. Add localjecks support in ambari for Ranger and Ranger KMS services (Mugdha Varadkar via srimanth)"

This reverts commit 481d04ae8f14dd1c70b575fa40d7796106956828.

ambari-common/src/main/python/resource_management/libraries/functions/constants.py

@@ -92,5 +92,4 @@ class StackFeature:
   ATLAS_UPGRADE_SUPPORT = "atlas_upgrade_support"
   RANGER_PID_SUPPORT = "ranger_pid_support"
   RANGER_KMS_PID_SUPPORT = "ranger_kms_pid_support"
-  RANGER_LOCALJCEKS_SUPPORT = "ranger_localjceks_support"
   RANGER_ADMIN_PASSWD_CHANGE = "ranger_admin_password_change"

ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py

@@ -66,7 +66,6 @@ stack_supports_ranger_kerberos = stack_version_formatted and check_stack_feature
 stack_supports_usersync_passwd = stack_version_formatted and check_stack_feature(StackFeature.RANGER_USERSYNC_PASSWORD_JCEKS, stack_version_formatted)
 stack_supports_logsearch_client = stack_version_formatted and check_stack_feature(StackFeature.RANGER_INSTALL_LOGSEARCH_CLIENT, stack_version_formatted)
 stack_supports_pid = stack_version_formatted and check_stack_feature(StackFeature.RANGER_PID_SUPPORT, stack_version_formatted)
-stack_supports_localjceks = stack_version_formatted and check_stack_feature(StackFeature.RANGER_LOCALJCEKS_SUPPORT, stack_version_formatted)
 stack_supports_ranger_admin_password_change = stack_version_formatted and check_stack_feature(StackFeature.RANGER_ADMIN_PASSWD_CHANGE, stack_version_formatted)
 
 downgrade_from_version = default("/commandParams/downgrade_from_version", None)
@@ -356,4 +355,4 @@ ranger_usersync_pid_file = format('{ranger_pid_dir}/usersync.pid')
 # admin credential
 admin_username = config['configurations']['ranger-env']['admin_username']
 admin_password = config['configurations']['ranger-env']['admin_password']
-default_admin_password = 'admin'
+default_admin_password = 'admin'

ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py

@@ -526,10 +526,7 @@ def ranger_credential_helper(lib_path, alias_key, alias_value, file_path):
   import params
 
   java_bin = format('{java_home}/bin/java')
-  jceks_scheme = 'jceks'
-  if params.stack_supports_localjceks:
-    jceks_scheme = 'localjceks'
-  file_path = format('{jceks_scheme}://file{file_path}')
+  file_path = format('jceks://file{file_path}')
   cmd = (java_bin, '-cp', lib_path, 'org.apache.ranger.credentialapi.buildks', 'create', alias_key, '-value', PasswordString(alias_value), '-provider', file_path)
   Execute(cmd, environment={'JAVA_HOME': params.java_home}, logoutput=True, sudo=True)
 

ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py

@@ -115,10 +115,7 @@ def do_keystore_setup(cred_provider_path, credential_alias, credential_password)
 
   if cred_provider_path is not None:
     java_bin = format('{java_home}/bin/java')
-    jceks_scheme = 'jceks'
-    if params.stack_supports_localjceks:
-      jceks_scheme = 'localjceks'
-    file_path = format('{jceks_scheme}://file{cred_provider_path}')
+    file_path = format('jceks://file{cred_provider_path}')
     cmd = (java_bin, '-cp', params.cred_lib_path, 'org.apache.ranger.credentialapi.buildks', 'create', credential_alias, '-value', PasswordString(credential_password), '-provider', file_path)
     Execute(cmd,
             environment={'JAVA_HOME': params.java_home}, 

ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/params.py

@@ -42,7 +42,6 @@ stack_supports_config_versioning =  stack_version_formatted and check_stack_feat
 stack_support_kms_hsm = stack_version_formatted and check_stack_feature(StackFeature.RANGER_KMS_HSM_SUPPORT, stack_version_formatted)
 stack_supports_ranger_kerberos = stack_version_formatted and check_stack_feature(StackFeature.RANGER_KERBEROS_SUPPORT, stack_version_formatted)
 stack_supports_pid = stack_version_formatted and check_stack_feature(StackFeature.RANGER_KMS_PID_SUPPORT, stack_version_formatted)
-stack_supports_localjceks = stack_version_formatted and check_stack_feature(StackFeature.RANGER_LOCALJCEKS_SUPPORT, stack_version_formatted)
 hadoop_conf_dir = conf_select.get_hadoop_conf_dir()
 security_enabled = config['configurations']['cluster-env']['security_enabled']
 

ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_features.json

@@ -265,11 +265,6 @@
       "name": "ranger_admin_password_change",
       "description": "Allow ranger admin credentials to be specified during cluster creation (AMBARI-17000)",
       "min_version": "2.5.0.0"
-    },
-    {
-      "name": "ranger_localjceks_support",
-      "description": "Ranger Service support localjceks",
-      "min_version": "2.5.0.0"
     }
   ]
 }

ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_admin.py

@@ -317,7 +317,7 @@ class TestRangerAdmin(RMFTestCase):
       mode = 0644
     )
 
-    self.assertResourceCalled('Execute', ('/usr/jdk64/jdk1.7.0_45/bin/java', '-cp', '/usr/hdp/current/ranger-admin/cred/lib/*', 'org.apache.ranger.credentialapi.buildks', 'create', 'rangeradmin', '-value', 'rangeradmin01', '-provider', 'localjceks://file/etc/ranger/admin/rangeradmin.jceks'),
+    self.assertResourceCalled('Execute', ('/usr/jdk64/jdk1.7.0_45/bin/java', '-cp', '/usr/hdp/current/ranger-admin/cred/lib/*', 'org.apache.ranger.credentialapi.buildks', 'create', 'rangeradmin', '-value', 'rangeradmin01', '-provider', 'jceks://file/etc/ranger/admin/rangeradmin.jceks'),
       environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'},
       logoutput=True,
       sudo = True
@@ -460,7 +460,7 @@ class TestRangerAdmin(RMFTestCase):
       mode = 0644
     )
 
-    self.assertResourceCalled('Execute', ('/usr/jdk64/jdk1.7.0_45/bin/java', '-cp', '/usr/hdp/current/ranger-admin/cred/lib/*', 'org.apache.ranger.credentialapi.buildks', 'create', 'rangeradmin', '-value', 'rangeradmin01', '-provider', 'localjceks://file/etc/ranger/admin/rangeradmin.jceks'),
+    self.assertResourceCalled('Execute', ('/usr/jdk64/jdk1.7.0_45/bin/java', '-cp', '/usr/hdp/current/ranger-admin/cred/lib/*', 'org.apache.ranger.credentialapi.buildks', 'create', 'rangeradmin', '-value', 'rangeradmin01', '-provider', 'jceks://file/etc/ranger/admin/rangeradmin.jceks'),
       environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'},
       logoutput=True,
       sudo = True

ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_usersync.py

@@ -148,13 +148,13 @@ class TestRangerUsersync(RMFTestCase):
       mode = 04555
     )
 
-    self.assertResourceCalled('Execute', ('/usr/jdk64/jdk1.7.0_45/bin/java', '-cp', '/usr/hdp/current/ranger-usersync/lib/*', 'org.apache.ranger.credentialapi.buildks', 'create', 'usersync.ssl.key.password', '-value', 'UnIx529p', '-provider', 'localjceks://file/usr/hdp/current/ranger-usersync/conf/ugsync.jceks'),
+    self.assertResourceCalled('Execute', ('/usr/jdk64/jdk1.7.0_45/bin/java', '-cp', '/usr/hdp/current/ranger-usersync/lib/*', 'org.apache.ranger.credentialapi.buildks', 'create', 'usersync.ssl.key.password', '-value', 'UnIx529p', '-provider', 'jceks://file/usr/hdp/current/ranger-usersync/conf/ugsync.jceks'),
       environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'},
       logoutput=True,
       sudo = True
     )
 
-    self.assertResourceCalled('Execute', ('/usr/jdk64/jdk1.7.0_45/bin/java', '-cp', '/usr/hdp/current/ranger-usersync/lib/*', 'org.apache.ranger.credentialapi.buildks', 'create', 'usersync.ssl.truststore.password', '-value', 'changeit', '-provider', 'localjceks://file/usr/hdp/current/ranger-usersync/conf/ugsync.jceks'),
+    self.assertResourceCalled('Execute', ('/usr/jdk64/jdk1.7.0_45/bin/java', '-cp', '/usr/hdp/current/ranger-usersync/lib/*', 'org.apache.ranger.credentialapi.buildks', 'create', 'usersync.ssl.truststore.password', '-value', 'changeit', '-provider', 'jceks://file/usr/hdp/current/ranger-usersync/conf/ugsync.jceks'),
       environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'},
       logoutput=True,
       sudo = True

ambari-server/src/test/python/stacks/2.5/RANGER_KMS/test_kms_server.py

@@ -318,7 +318,7 @@ class TestRangerKMS(RMFTestCase):
       mode = 0775
     )
 
-    self.assertResourceCalled('Execute', ('/usr/jdk64/jdk1.7.0_45/bin/java', '-cp', '/usr/hdp/current/ranger-kms/cred/lib/*', 'org.apache.ranger.credentialapi.buildks', 'create', 'ranger.ks.jdbc.password', '-value', 'rangerkms01', '-provider', 'localjceks://file/etc/ranger/kms/rangerkms.jceks'),
+    self.assertResourceCalled('Execute', ('/usr/jdk64/jdk1.7.0_45/bin/java', '-cp', '/usr/hdp/current/ranger-kms/cred/lib/*', 'org.apache.ranger.credentialapi.buildks', 'create', 'ranger.ks.jdbc.password', '-value', 'rangerkms01', '-provider', 'jceks://file/etc/ranger/kms/rangerkms.jceks'),
       environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'},
       logoutput=True,
       sudo=True
@@ -330,7 +330,7 @@ class TestRangerKMS(RMFTestCase):
       mode = 0640
     )
 
-    self.assertResourceCalled('Execute', ('/usr/jdk64/jdk1.7.0_45/bin/java', '-cp', '/usr/hdp/current/ranger-kms/cred/lib/*', 'org.apache.ranger.credentialapi.buildks', 'create', 'ranger.ks.masterkey.password', '-value', 'StrongPassword01', '-provider', 'localjceks://file/etc/ranger/kms/rangerkms.jceks'),
+    self.assertResourceCalled('Execute', ('/usr/jdk64/jdk1.7.0_45/bin/java', '-cp', '/usr/hdp/current/ranger-kms/cred/lib/*', 'org.apache.ranger.credentialapi.buildks', 'create', 'ranger.ks.masterkey.password', '-value', 'StrongPassword01', '-provider', 'jceks://file/etc/ranger/kms/rangerkms.jceks'),
       environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'},
       logoutput=True,
       sudo=True
@@ -643,7 +643,7 @@ class TestRangerKMS(RMFTestCase):
       mode = 0775
     )
 
-    self.assertResourceCalled('Execute', ('/usr/jdk64/jdk1.7.0_45/bin/java', '-cp', '/usr/hdp/current/ranger-kms/cred/lib/*', 'org.apache.ranger.credentialapi.buildks', 'create', 'ranger.ks.jdbc.password', '-value', 'rangerkms01', '-provider', 'localjceks://file/etc/ranger/kms/rangerkms.jceks'),
+    self.assertResourceCalled('Execute', ('/usr/jdk64/jdk1.7.0_45/bin/java', '-cp', '/usr/hdp/current/ranger-kms/cred/lib/*', 'org.apache.ranger.credentialapi.buildks', 'create', 'ranger.ks.jdbc.password', '-value', 'rangerkms01', '-provider', 'jceks://file/etc/ranger/kms/rangerkms.jceks'),
       environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'},
       logoutput=True,
       sudo=True
@@ -655,7 +655,7 @@ class TestRangerKMS(RMFTestCase):
       mode = 0640
     )
 
-    self.assertResourceCalled('Execute', ('/usr/jdk64/jdk1.7.0_45/bin/java', '-cp', '/usr/hdp/current/ranger-kms/cred/lib/*', 'org.apache.ranger.credentialapi.buildks', 'create', 'ranger.ks.masterkey.password', '-value', 'StrongPassword01', '-provider', 'localjceks://file/etc/ranger/kms/rangerkms.jceks'),
+    self.assertResourceCalled('Execute', ('/usr/jdk64/jdk1.7.0_45/bin/java', '-cp', '/usr/hdp/current/ranger-kms/cred/lib/*', 'org.apache.ranger.credentialapi.buildks', 'create', 'ranger.ks.masterkey.password', '-value', 'StrongPassword01', '-provider', 'jceks://file/etc/ranger/kms/rangerkms.jceks'),
       environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'},
       logoutput=True,
       sudo=True