ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maha...@apache.org
Subject [14/51] [partial] ambari git commit: Revert "[RTC 136620]: Introduce BigInsights stacks on Ambari 2.4 branch"
Date Wed, 17 Aug 2016 05:41:03 GMT
http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/package/scripts/kerberos_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/package/scripts/kerberos_server.py b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/package/scripts/kerberos_server.py
deleted file mode 100644
index 8cc4312..0000000
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/package/scripts/kerberos_server.py
+++ /dev/null
@@ -1,141 +0,0 @@
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-
-from kerberos_common import *
-from ambari_commons.os_check import OSCheck
-
-class KerberosServer(KerberosScript):
-  @staticmethod
-  def write_kadm5_acl():
-    import params
-
-    Directory(params.kadm5_acl_dir,
-              owner='root',
-              recursive=True,
-              group='root',
-              mode=0700
-    )
-
-    if (params.kadm5_acl_template is None) or not params.kadm5_acl_template.strip():
-      content = Template('kadm5_acl.j2')
-    else:
-      content = InlineTemplate(params.kadm5_acl_template)
-
-    File(params.kadm5_acl_path,
-         content=content,
-         owner='root',
-         group='root',
-         mode=0600
-    )
-
-  @staticmethod
-  def write_kdc_conf():
-    import params
-
-    Directory(params.kdc_conf_dir,
-              owner='root',
-              recursive=True,
-              group='root',
-              mode=0700
-    )
-
-    if (params.kdc_conf_template is None) or not params.kdc_conf_template.strip():
-      content = Template('kdc_conf.j2')
-    else:
-      content = InlineTemplate(params.kdc_conf_template)
-
-    File(params.kdc_conf_path,
-         content=content,
-         owner='root',
-         group='root',
-         mode=0600
-    )
-
-  def install(self, env):
-    import params
-
-    self.install_packages(env)
-    self.configure(env)
-
-    # Create the Kerberos database (only on install, for now)
-    Execute(
-      "%s create -s -P '%s'" % (params.kdb5_util_path, KerberosScript.create_random_password()))
-
-    # Create or update the administrator account
-    KerberosScript.create_or_update_administrator_identity()
-
-
-  def start(self, env):
-    # Attempt to reconfigure the service before starting
-    self.configure(env)
-
-    # Create or update the administrator account
-    KerberosScript.create_or_update_administrator_identity()
-
-    if OSCheck.is_suse_family():
-      Execute('rckadmind start')
-      Execute('rckrb5kdc start')
-    elif OSCheck.is_ubuntu_family():
-      Execute('service krb5-kdc start')
-      Execute('service krb5-admin-server start')
-    else:
-      Execute('service krb5kdc start')
-      Execute('service kadmin start')
-
-  def stop(self, env):
-    if OSCheck.is_suse_family():
-      Execute('rckadmind stop')
-      Execute('rckrb5kdc stop')
-    elif OSCheck.is_ubuntu_family():
-      Execute('service krb5-kdc stop')
-      Execute('service krb5-admin-server stop')
-    else:
-      Execute('service krb5kdc stop')
-      Execute('service kadmin stop')
-
-
-  def configure(self, env):
-    import params
-    env.set_params(params)
-
-    KerberosServer.write_krb5_conf()
-    KerberosServer.write_kdc_conf()
-    KerberosServer.write_kadm5_acl()
-
-  def status(self, env):
-    import params
-
-    if OSCheck.is_suse_family():
-      try:
-        Execute('checkproc `which krb5kdc`')
-        Execute('checkproc `which kadmind`')
-      except Fail as ex:
-        raise ComponentIsNotRunning()
-
-    elif OSCheck.is_ubuntu_family():
-      check_process_status(params.kdamin_pid_path)
-      check_process_status(params.krb5kdc_pid_path)
-
-    else:
-      check_process_status(params.kdamin_pid_path)
-      check_process_status(params.krb5kdc_pid_path)
-
-
-if __name__ == "__main__":
-  KerberosServer().execute()

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/package/scripts/params.py b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/package/scripts/params.py
deleted file mode 100755
index 422c686..0000000
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/package/scripts/params.py
+++ /dev/null
@@ -1,191 +0,0 @@
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-
-from resource_management import *
-from utils import get_property_value, get_unstructured_data
-from ambari_commons.os_check import OSCheck
-
-krb5_conf_dir = '/etc'
-krb5_conf_file = 'krb5.conf'
-krb5_conf_path = krb5_conf_dir + '/' + krb5_conf_file
-
-if OSCheck.is_suse_family():
-  kdc_conf_dir = '/var/lib/kerberos/krb5kdc'
-elif OSCheck.is_ubuntu_family():
-  kdc_conf_dir = '/etc/krb5kdc'
-else:
-  kdc_conf_dir = '/var/kerberos/krb5kdc'
-kdc_conf_file = 'kdc.conf'
-kdc_conf_path = kdc_conf_dir + '/' + kdc_conf_file
-
-kadm5_acl_dir = kdc_conf_dir  # Typically kadm5.acl and kdc.conf exist in the same directory
-kadm5_acl_file = 'kadm5.acl'
-kadm5_acl_path = kadm5_acl_dir + '/' + kadm5_acl_file
-
-config = Script.get_config()
-tmp_dir = Script.get_tmp_dir()
-host_sys_prepped = default("/hostLevelParams/host_sys_prepped", False)
-
-configurations = None
-keytab_details = None
-default_group = None
-kdc_server_host = None
-cluster_host_info = None
-
-hostname = config['hostname']
-
-kdb5_util_path = 'kdb5_util'
-
-kdamin_pid_path = '/var/run/kadmind.pid'
-krb5kdc_pid_path = '/var/run/krb5kdc.pid'
-
-smoke_test_principal = None
-smoke_test_keytab_file = None
-
-smoke_user = 'ambari-qa'
-
-manage_identities = 'true'
-
-artifact_dir = format("{tmp_dir}/AMBARI-artifacts/")
-jce_policy_zip = default("/hostLevelParams/jce_name", None) # None when jdk is already installed by user
-jce_location = config['hostLevelParams']['jdk_location']
-jdk_name = default("/hostLevelParams/jdk_name", None)
-java_home = config['hostLevelParams']['java_home']
-java_version = int(config['hostLevelParams']['java_version'])
-
-security_enabled = config['configurations']['cluster-env']['security_enabled']
-
-if config is not None:
-  kerberos_command_params = get_property_value(config, 'kerberosCommandParams')
-
-  cluster_host_info = get_property_value(config, 'clusterHostInfo')
-  if cluster_host_info is not None:
-    kdc_server_hosts = get_property_value(cluster_host_info, 'kdc_server_hosts')
-
-    if (kdc_server_hosts is not None) and (len(kdc_server_hosts) > 0):
-      kdc_server_host = kdc_server_hosts[0]
-
-  configurations = get_property_value(config, 'configurations')
-  if configurations is not None:
-    cluster_env = get_property_value(configurations, 'cluster-env')
-
-    if cluster_env is not None:
-      smoke_test_principal = get_property_value(cluster_env, 'smokeuser_principal_name', None, True, None)
-      smoke_test_keytab_file = get_property_value(cluster_env, 'smokeuser_keytab', None, True, None)
-      smoke_user = get_property_value(cluster_env, 'smokeuser', smoke_user, True, smoke_user)
-
-      default_group = get_property_value(cluster_env, 'user_group')
-
-      if default_group is None:
-        default_group = get_property_value(cluster_env, 'user-group')
-
-    # ##############################################################################################
-    # Get krb5.conf template data
-    # ##############################################################################################
-    realm = 'EXAMPLE.COM'
-    domains = ''
-    kdc_host = 'localhost'
-    admin_server_host = None
-    admin_principal = None
-    admin_password = None
-    admin_keytab = None
-    test_principal = None
-    test_password = None
-    test_keytab = None
-    test_keytab_file = None
-    encryption_types = None
-    manage_krb5_conf = "true"
-    krb5_conf_template = None
-
-    krb5_conf_data = get_property_value(configurations, 'krb5-conf')
-
-    kerberos_env = get_property_value(configurations, "kerberos-env")
-
-    if kerberos_env is not None:
-      manage_identities = get_property_value(kerberos_env, "manage_identities", "true", True, "true")
-      encryption_types = get_property_value(kerberos_env, "encryption_types", None, True, None)
-      realm = get_property_value(kerberos_env, "realm", None, True, None)
-      kdc_host = get_property_value(kerberos_env, 'kdc_host', kdc_host)
-      admin_server_host = get_property_value(kerberos_env, 'admin_server_host', admin_server_host)
-
-    if krb5_conf_data is not None:
-      realm = get_property_value(krb5_conf_data, 'realm', realm)
-      domains = get_property_value(krb5_conf_data, 'domains', domains)
-
-      admin_principal = get_property_value(krb5_conf_data, 'admin_principal', admin_principal, True, None)
-      admin_password = get_property_value(krb5_conf_data, 'admin_password', admin_password, True, None)
-      admin_keytab = get_property_value(krb5_conf_data, 'admin_keytab', admin_keytab, True, None)
-
-      test_principal = get_property_value(krb5_conf_data, 'test_principal', test_principal, True, None)
-      test_password = get_property_value(krb5_conf_data, 'test_password', test_password, True, None)
-      test_keytab = get_property_value(krb5_conf_data, 'test_keytab', test_keytab, True, None)
-      test_keytab_file = get_property_value(krb5_conf_data, 'test_keytab_file', test_keytab_file, True, None)
-
-      krb5_conf_template = get_property_value(krb5_conf_data, 'content', krb5_conf_template)
-      krb5_conf_dir = get_property_value(krb5_conf_data, 'conf_dir', krb5_conf_dir)
-      krb5_conf_file = get_property_value(krb5_conf_data, 'conf_file', krb5_conf_file)
-      krb5_conf_path = krb5_conf_dir + '/' + krb5_conf_file
-
-      manage_krb5_conf = get_property_value(krb5_conf_data, 'manage_krb5_conf', "true")
-
-    # ##############################################################################################
-    # Get kdc.conf template data
-    # ##############################################################################################
-    kdcdefaults_kdc_ports = "88"
-    kdcdefaults_kdc_tcp_ports = "88"
-
-    kdc_conf_template = None
-
-    kdc_conf_data = get_property_value(configurations, 'kdc-conf')
-
-    if kdc_conf_data is not None:
-      kdcdefaults_kdc_ports = get_property_value(kdc_conf_data, 'kdcdefaults_kdc_ports', kdcdefaults_kdc_ports)
-      kdcdefaults_kdc_tcp_ports = get_property_value(kdc_conf_data, 'kdcdefaults_kdc_tcp_ports', kdcdefaults_kdc_tcp_ports)
-
-      kdc_conf_template = get_property_value(kdc_conf_data, 'content', kdc_conf_template)
-      kdc_conf_dir = get_property_value(kdc_conf_data, 'conf_dir', kdc_conf_dir)
-      kdc_conf_file = get_property_value(kdc_conf_data, 'conf_file', kdc_conf_file)
-      kdc_conf_path = kdc_conf_dir + '/' + kdc_conf_file
-
-    # ##############################################################################################
-    # Get kadm5.acl template data
-    # ##############################################################################################
-    kdcdefaults_kdc_ports = '88'
-    kdcdefaults_kdc_tcp_ports = '88'
-
-    kadm5_acl_template = None
-
-    kadm5_acl_data = get_property_value(configurations, 'kadm5-acl')
-
-    if kadm5_acl_data is not None:
-      kadm5_acl_template = get_property_value(kadm5_acl_data, 'content', kadm5_acl_template)
-      kadm5_acl_dir = get_property_value(kadm5_acl_data, 'conf_dir', kadm5_acl_dir)
-      kadm5_acl_file = get_property_value(kadm5_acl_data, 'conf_file', kadm5_acl_file)
-      kadm5_acl_path = kadm5_acl_dir + '/' + kadm5_acl_file
-
-  # ################################################################################################
-  # Get commandParams
-  # ################################################################################################
-  command_params = get_property_value(config, 'commandParams')
-  if command_params is not None:
-    keytab_details = get_unstructured_data(command_params, 'keytab')
-
-    if manage_identities:
-      smoke_test_principal = get_property_value(command_params, 'principal_name', smoke_test_principal)
-      smoke_test_keytab_file = get_property_value(command_params, 'keytab_file', smoke_test_keytab_file)

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/package/scripts/service_check.py b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/package/scripts/service_check.py
deleted file mode 100644
index 7c09171..0000000
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/package/scripts/service_check.py
+++ /dev/null
@@ -1,81 +0,0 @@
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Ambari Agent
-
-"""
-
-from kerberos_common import *
-from resource_management import *
-
-# hashlib is supplied as of Python 2.5 as the replacement interface for md5
-# and other secure hashes.  In 2.6, md5 is deprecated.  Import hashlib if
-# available, avoiding a deprecation warning under 2.6.  Import md5 otherwise,
-# preserving 2.4 compatibility.
-try:
-  import hashlib
-  _md5 = hashlib.md5
-except ImportError:
-  import md5
-  _md5 = md5.new
-
-class KerberosServiceCheck(KerberosScript):
-  def service_check(self, env):
-    import params
-
-    # If Ambari IS managing Kerberos identities (kerberos-env/manage_identities = true), it is
-    # expected that a (smoke) test principal and its associated keytab file is available for use
-    # **  If not available, this service check will fail
-    # **  If available, this service check will execute
-    #
-    # If Ambari IS NOT managing Kerberos identities (kerberos-env/manage_identities = false), the
-    # smoke test principal and its associated keytab file may not be available
-    # **  If not available, this service check will execute
-    # **  If available, this service check will execute
-
-    if ((params.smoke_test_principal is not None) and
-          (params.smoke_test_keytab_file is not None) and
-          os.path.isfile(params.smoke_test_keytab_file)):
-      print "Performing kinit using %s" % params.smoke_test_principal
-
-      ccache_file_name = _md5("{0}|{1}".format(params.smoke_test_principal,params.smoke_test_keytab_file)).hexdigest()
-      ccache_file_path = "{0}{1}kerberos_service_check_cc_{2}".format(params.tmp_dir, os.sep, ccache_file_name)
-
-      kinit_path_local = functions.get_kinit_path(default('/configurations/kerberos-env/executable_search_paths', None))
-      kinit_command = "{0} -c {1} -kt {2} {3}".format(kinit_path_local, ccache_file_path, params.smoke_test_keytab_file, params.smoke_test_principal)
-
-      try:
-        # kinit
-        Execute(kinit_command,
-                user=params.smoke_user
-        )
-      finally:
-        File(ccache_file_path, # Since kinit might fail to write to the cache file for various reasons, an existence check should be done before cleanup
-             action = "delete",
-        )
-    elif params.manage_identities:
-      err_msg = Logger.filter_text("Failed to execute kinit test due to principal or keytab not found or available")
-      raise Fail(err_msg)
-    else:
-      # Ambari is not managing identities so if the smoke user does not exist, indicate why....
-      print "Skipping this service check since Ambari is not managing Kerberos identities and the smoke user " \
-            "credentials are not available. To execute this service check, the smoke user principal name " \
-            "and keytab file location must be set in the cluster_env and the smoke user's keytab file must" \
-            "exist in the configured location."
-
-if __name__ == "__main__":
-  KerberosServiceCheck().execute()

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/package/scripts/status_params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/package/scripts/status_params.py b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/package/scripts/status_params.py
deleted file mode 100644
index bbae4a3..0000000
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/package/scripts/status_params.py
+++ /dev/null
@@ -1,32 +0,0 @@
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-
-from resource_management import *
-
-config = Script.get_config()
-tmp_dir = Script.get_tmp_dir()
-
-hostname = config['hostname']
-kinit_path_local = functions.get_kinit_path(default('/configurations/kerberos-env/executable_search_paths', None))
-
-security_enabled = config['configurations']['cluster-env']['security_enabled']
-
-smoke_user_keytab = config['configurations']['cluster-env']['smokeuser_keytab']
-smoke_user = config['configurations']['cluster-env']['smokeuser']
-smoke_user_principal = config['configurations']['cluster-env']['smokeuser_principal_name']

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/package/scripts/utils.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/package/scripts/utils.py b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/package/scripts/utils.py
deleted file mode 100644
index 199e6d7..0000000
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/package/scripts/utils.py
+++ /dev/null
@@ -1,105 +0,0 @@
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-
-def get_property_value(dictionary, property_name, default_value=None, trim_string=False,
-                       empty_value=""):
-  """
-  Get a property value from a dictionary, applying applying rules as necessary.
-
-  If dictionary does not contain a value for property_name or the value for property_name is None,
-  null_value is used as the value to return.  Then, if trim_string is True and the value is None
-  or the value is an empty string, empty_value will be return else the (current) value is returned.
-
-  Note: the property value will most likely be a string or a unicode string, however in the event
-  it is not (for example a number), this method will behave properly and return the value as is.
-
-  :param dictionary: a dictionary of values
-  :param property_name: the name of a dictionary item to retrieve
-  :param default_value: the value to use if the item is not in the dictionary or the value of the item is None
-  :param trim_string: a Boolean value indicating whether to strip whitespace from the value (True) or not (False)
-  :param empty_value: the value to use if the (current) value is None or an empty string, if trim_string is True
-  :return: the requested property value with rules applied
-  """
-  # If property_name is not in the dictionary, set value to null_value
-  if property_name in dictionary:
-    value = dictionary[property_name]
-    if value is None:
-      value = default_value
-  else:
-    value = default_value
-
-  if trim_string:
-    # If the value is none, consider it empty...
-    if value is None:
-      value = empty_value
-    elif (type(value) == str) or (type(value) == unicode):
-      value = value.strip()
-
-      if len(value) == 0:
-        value = empty_value
-
-  return value
-
-def get_unstructured_data(dictionary, property_name):
-  prefix = property_name + '/'
-  prefix_len = len(prefix)
-  return dict((k[prefix_len:], v) for k, v in dictionary.iteritems() if k.startswith(prefix))
-
-def split_host_and_port(host):
-  """
-  Splits a string into its host and port components
-
-  :param host: a string matching the following pattern: <host name | ip address>[:port]
-  :return: a Dictionary containing 'host' and 'port' entries for the input value
-  """
-
-  if host is None:
-    host_and_port = None
-  else:
-    host_and_port = {}
-    parts = host.split(":")
-
-    if parts is not None:
-      length = len(parts)
-
-      if length > 0:
-        host_and_port['host'] = parts[0]
-
-        if length > 1:
-          host_and_port['port'] = int(parts[1])
-
-  return host_and_port
-
-def set_port(host, port):
-  """
-  Sets the port for a host specification, potentially replacing an existing port declaration
-
-  :param host: a string matching the following pattern: <host name | ip address>[:port]
-  :param port: a string or integer declaring the (new) port
-  :return: a string declaring the new host/port specification
-  """
-  if port is None:
-    return host
-  else:
-    host_and_port = split_host_and_port(host)
-
-    if (host_and_port is not None) and ('host' in host_and_port):
-      return "%s:%s" % (host_and_port['host'], port)
-    else:
-      return host

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/package/templates/kadm5_acl.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/package/templates/kadm5_acl.j2 b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/package/templates/kadm5_acl.j2
deleted file mode 100644
index d82ae23..0000000
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/package/templates/kadm5_acl.j2
+++ /dev/null
@@ -1,20 +0,0 @@
-{#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#}
-*/admin@{{realm}}	*
-
-{# Append additional realm declarations should be placed below #}

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/package/templates/kdc_conf.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/package/templates/kdc_conf.j2 b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/package/templates/kdc_conf.j2
deleted file mode 100644
index f78adc7..0000000
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/package/templates/kdc_conf.j2
+++ /dev/null
@@ -1,30 +0,0 @@
-{#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#}
-[kdcdefaults]
-  kdc_ports = {{kdcdefaults_kdc_ports}}
-  kdc_tcp_ports = {{kdcdefaults_kdc_tcp_ports}}
-
-[realms]
-  {{realm}} = {
-    acl_file = {{kadm5_acl_path}}
-    dict_file = /usr/share/dict/words
-    admin_keytab = {{kadm5_acl_dir}}/kadm5.keytab
-    supported_enctypes = {{encryption_types}}
-  }
-
-{# Append additional realm declarations should be placed below #}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/package/templates/krb5_conf.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/package/templates/krb5_conf.j2 b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/package/templates/krb5_conf.j2
deleted file mode 100644
index cc6f63a..0000000
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/package/templates/krb5_conf.j2
+++ /dev/null
@@ -1,46 +0,0 @@
-{#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#}
-[libdefaults]
-  renew_lifetime = 7d
-  forwardable = true
-  default_realm = {{realm|upper()}}
-  ticket_lifetime = 24h
-  dns_lookup_realm = false
-  dns_lookup_kdc = false
-  #default_tgs_enctypes = {{encryption_types}}
-  #default_tkt_enctypes = {{encryption_types}}
-
-{% if domains %}
-[domain_realm]
-{% for domain in domains.split(',') %}
-  {{domain}} = {{realm|upper()}}
-{% endfor %}
-{% endif %}
-
-[logging]
-  default = FILE:/var/log/krb5kdc.log
-  admin_server = FILE:/var/log/kadmind.log
-  kdc = FILE:/var/log/krb5kdc.log
-
-[realms]
-  {{realm}} = {
-    admin_server = {{admin_server_host|default(kdc_host, True)}}
-    kdc = {{kdc_host}}
-  }
-
-{# Append additional realm declarations below #}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/alerts.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/alerts.json b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/alerts.json
deleted file mode 100644
index 4986e04..0000000
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/alerts.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "KNOX": {
-    "service": [],
-    "KNOX_GATEWAY": [
-      {
-        "name": "knox_gateway_process",
-        "label": "Knox Gateway Process",
-        "description": "This host-level alert is triggered if the Knox Gateway cannot be determined to be up.",
-        "interval": 1,
-        "scope": "HOST",
-        "source": {
-          "type": "PORT",
-          "uri": "{{gateway-site/gateway.port}}",
-          "default_port": 8443,
-          "reporting": {
-            "ok": {
-              "text": "TCP OK - {0:.3f}s response on port {1}"
-            },
-            "warning": {
-              "text": "TCP OK - {0:.3f}s response on port {1}",
-              "value": 1.5
-            },
-            "critical": {
-              "text": "Connection failed: {0} to {1}:{2}",
-              "value": 5.0
-            }
-          }
-        }
-      }
-    ]
-  }
-}

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/gateway-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/gateway-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/gateway-log4j.xml
deleted file mode 100644
index 370f786..0000000
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/gateway-log4j.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration supports_final="false">
-
-  <property>
-    <name>content</name>
-    <value>
-
-      # Licensed to the Apache Software Foundation (ASF) under one
-      # or more contributor license agreements. See the NOTICE file
-      # distributed with this work for additional information
-      # regarding copyright ownership. The ASF licenses this file
-      # to you under the Apache License, Version 2.0 (the
-      # "License"); you may not use this file except in compliance
-      # with the License. You may obtain a copy of the License at
-      #
-      # http://www.apache.org/licenses/LICENSE-2.0
-      #
-      # Unless required by applicable law or agreed to in writing, software
-      # distributed under the License is distributed on an "AS IS" BASIS,
-      # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      # See the License for the specific language governing permissions and
-      # limitations under the License.
-
-      app.log.dir=${launcher.dir}/../logs
-      app.log.file=${launcher.name}.log
-      app.audit.file=${launcher.name}-audit.log
-
-      log4j.rootLogger=ERROR, drfa
-
-      log4j.logger.org.apache.hadoop.gateway=INFO
-      #log4j.logger.org.apache.hadoop.gateway=DEBUG
-
-      #log4j.logger.org.eclipse.jetty=DEBUG
-      #log4j.logger.org.apache.shiro=DEBUG
-      #log4j.logger.org.apache.http=DEBUG
-      #log4j.logger.org.apache.http.client=DEBUG
-      #log4j.logger.org.apache.http.headers=DEBUG
-      #log4j.logger.org.apache.http.wire=DEBUG
-
-      log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-      log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-      log4j.appender.stdout.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{2}: %m%n
-
-      log4j.appender.drfa=org.apache.log4j.DailyRollingFileAppender
-      log4j.appender.drfa.File=${app.log.dir}/${app.log.file}
-      log4j.appender.drfa.DatePattern=.yyyy-MM-dd
-      log4j.appender.drfa.layout=org.apache.log4j.PatternLayout
-      log4j.appender.drfa.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n
-
-      log4j.logger.audit=INFO, auditfile
-      log4j.appender.auditfile=org.apache.log4j.DailyRollingFileAppender
-      log4j.appender.auditfile.File=${app.log.dir}/${app.audit.file}
-      log4j.appender.auditfile.Append = true
-      log4j.appender.auditfile.DatePattern = '.'yyyy-MM-dd
-      log4j.appender.auditfile.layout = org.apache.hadoop.gateway.audit.log4j.layout.AuditLayout
-
-    </value>
-    <description>
-      content for log4j.properties file for Knox.
-    </description>
-  </property>
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/gateway-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/gateway-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/gateway-site.xml
deleted file mode 100644
index 4d4c4ed..0000000
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/gateway-site.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<!-- The default settings for Knox. -->
-<!-- Edit gateway-site.xml to change settings for your local -->
-<!-- install. -->
-
-<configuration supports_final="false">
-
-    <property>
-        <name>gateway.port</name>
-        <value>8443</value>
-        <description>The HTTP port for the Gateway.</description>
-    </property>
-
-    <property>
-        <name>gateway.path</name>
-        <value>gateway</value>
-        <description>The default context path for the gateway.</description>
-    </property>
-
-    <property>
-        <name>gateway.gateway.conf.dir</name>
-        <value>deployments</value>
-        <description>The directory within GATEWAY_HOME that contains gateway topology files and deployments.</description>
-    </property>
-
-    <property>
-        <name>gateway.hadoop.kerberos.secured</name>
-        <value>false</value>
-        <description>Boolean flag indicating whether the Hadoop cluster protected by Gateway is secured with Kerberos</description>
-    </property>
-
-    <property>
-        <name>java.security.krb5.conf</name>
-        <value>/etc/knox/conf/krb5.conf</value>
-        <description>Absolute path to krb5.conf file</description>
-    </property>
-
-    <property>
-        <name>java.security.auth.login.config</name>
-        <value>/etc/knox/conf/krb5JAASLogin.conf</value>
-        <description>Absolute path to JASS login config file</description>
-    </property>
-
-    <property>
-        <name>sun.security.krb5.debug</name>
-        <value>true</value>
-        <description>Boolean flag indicating whether to enable debug messages for krb5 authentication</description>
-    </property>
-
-</configuration>
-
-
-
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/knox-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/knox-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/knox-env.xml
deleted file mode 100644
index f13873e..0000000
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/knox-env.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration supports_final="true">
-    <!-- knox-env.sh -->
-
-    <property require-input="true">
-        <name>knox_master_secret</name>
-      <display-name>Knox Master Secret</display-name>
-      <value></value>
-      <property-type>PASSWORD</property-type>
-      <description>password to use as the master secret</description>
-      <value-attributes>
-        <editable-only-at-install>true</editable-only-at-install>
-        <overridable>false</overridable>
-      </value-attributes>
-    </property>
-
-    <property>
-        <name>knox_user</name>
-        <value>knox</value>
-        <property-type>USER</property-type>
-        <description>Knox Username.</description>
-    </property>
-
-    <property>
-        <name>knox_group</name>
-        <value>knox</value>
-        <property-type>GROUP</property-type>
-        <description>Knox Group.</description>
-    </property>
-
-    <property>
-        <name>knox_pid_dir</name>
-      <display-name>Knox PID dir</display-name>
-      <value>/var/run/knox</value>
-      <description>Knox PID dir.</description>
-      <value-attributes>
-        <type>directory</type>
-        <editable-only-at-install>true</editable-only-at-install>
-        <overridable>false</overridable>
-      </value-attributes>
-    </property>
-
-    <property>
-        <name>knox_logs_dir</name>
-      <display-name>Knox Logs dir</display-name>
-      <value>/var/log/knox</value>
-      <description>Knox Log dir.</description>
-      <value-attributes>
-        <type>directory</type>
-        <editable-only-at-install>true</editable-only-at-install>
-        <overridable>false</overridable>
-      </value-attributes>
-    </property>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ldap-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ldap-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ldap-log4j.xml
deleted file mode 100644
index a0cf658..0000000
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ldap-log4j.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration supports_final="false">
-
-  <property>
-    <name>content</name>
-    <value>
-        # Licensed to the Apache Software Foundation (ASF) under one
-        # or more contributor license agreements.  See the NOTICE file
-        # distributed with this work for additional information
-        # regarding copyright ownership.  The ASF licenses this file
-        # to you under the Apache License, Version 2.0 (the
-        # "License"); you may not use this file except in compliance
-        # with the License.  You may obtain a copy of the License at
-        #
-        #     http://www.apache.org/licenses/LICENSE-2.0
-        #
-        # Unless required by applicable law or agreed to in writing, software
-        # distributed under the License is distributed on an "AS IS" BASIS,
-        # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-        # See the License for the specific language governing permissions and
-        # limitations under the License.
-
-        app.log.dir=${launcher.dir}/../logs
-        app.log.file=${launcher.name}.log
-
-        log4j.rootLogger=ERROR, drfa
-        log4j.logger.org.apache.directory.server.ldap.LdapServer=INFO
-        log4j.logger.org.apache.directory=WARN
-
-        log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-        log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-        log4j.appender.stdout.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{2}: %m%n
-
-        log4j.appender.drfa=org.apache.log4j.DailyRollingFileAppender
-        log4j.appender.drfa.File=${app.log.dir}/${app.log.file}
-        log4j.appender.drfa.DatePattern=.yyyy-MM-dd
-        log4j.appender.drfa.layout=org.apache.log4j.PatternLayout
-        log4j.appender.drfa.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n
-
-    </value>
-    <description>
-      content for log4j.properties file for the demo LDAP that comes with Knox.
-    </description>
-  </property>
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ranger-knox-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ranger-knox-audit.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ranger-knox-audit.xml
deleted file mode 100644
index bdc5371..0000000
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ranger-knox-audit.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-<configuration>
-
-  <property>
-    <name>xasecure.audit.is.enabled</name>
-    <value>true</value>
-    <description>Is Audit enabled?</description>
-  </property>
-
-  <property>
-    <name>xasecure.audit.destination.db</name>
-    <value>false</value>
-    <display-name>Audit to DB</display-name>
-    <description>Is Audit to DB enabled?</description>
-    <value-attributes>
-      <type>boolean</type>
-    </value-attributes>
-    <depends-on>
-      <property>
-        <type>ranger-env</type>
-        <name>xasecure.audit.destination.db</name>
-      </property>
-    </depends-on>
-  </property>
-
-  <property>
-    <name>xasecure.audit.destination.db.jdbc.url</name>
-    <value>{{audit_jdbc_url}}</value>
-    <description>Audit DB JDBC URL</description>
-  </property>
-
-  <property>
-    <name>xasecure.audit.destination.db.user</name>
-    <value>{{xa_audit_db_user}}</value>
-    <description>Audit DB JDBC User</description>
-  </property>
-
-  <property>
-    <name>xasecure.audit.destination.db.password</name>
-    <value>crypted</value>
-    <property-type>PASSWORD</property-type>
-    <description>Audit DB JDBC Password</description>
-  </property>
-
-  <property>
-    <name>xasecure.audit.destination.db.jdbc.driver</name>
-    <value>{{jdbc_driver}}</value>
-    <description>Audit DB JDBC Driver</description>
-  </property>
-
-  <property>
-    <name>xasecure.audit.credential.provider.file</name>
-    <value>jceks://file{{credential_file}}</value>
-    <description>Credential file store</description>
-  </property>
-
-  <property>
-    <name>xasecure.audit.destination.db.batch.filespool.dir</name>
-    <value>/var/log/knox/audit/db/spool</value>
-    <description>/var/log/knox/audit/db/spool</description>
-  </property>  
-
-  <property>
-    <name>xasecure.audit.destination.hdfs</name>
-    <value>true</value>
-    <display-name>Audit to HDFS</display-name>
-    <description>Is Audit to HDFS enabled?</description>
-    <value-attributes>
-      <type>boolean</type>
-    </value-attributes>
-    <depends-on>
-      <property>
-        <type>ranger-env</type>
-        <name>xasecure.audit.destination.hdfs</name>
-      </property>
-    </depends-on>
-  </property>
-
-  <property>
-    <name>xasecure.audit.destination.hdfs.dir</name>
-    <value>hdfs://NAMENODE_HOSTNAME:8020/ranger/audit</value>
-    <description>HDFS folder to write audit to, make sure the service user has requried permissions</description>
-    <depends-on>
-      <property>
-        <type>ranger-env</type>
-        <name>xasecure.audit.destination.hdfs.dir</name>
-      </property>
-    </depends-on>
-  </property>
-
-  <property>
-    <name>xasecure.audit.destination.hdfs.batch.filespool.dir</name>
-    <value>/var/log/knox/audit/hdfs/spool</value>
-    <description>/var/log/knox/audit/hdfs/spool</description>
-  </property>
-  
-  <!-- Removing auditing to Solr   
-  <property>
-    <name>xasecure.audit.destination.solr</name>
-    <value>false</value>
-    <display-name>Audit to SOLR</display-name>
-    <description>Is Solr audit enabled?</description>
-    <value-attributes>
-      <type>boolean</type>
-    </value-attributes>
-    <depends-on>
-      <property>
-        <type>ranger-env</type>
-        <name>xasecure.audit.destination.solr</name>
-      </property>
-    </depends-on>
-  </property>
-
-  <property>
-    <name>xasecure.audit.destination.solr.urls</name>
-    <value></value>
-    <description>Solr URL</description>
-    <value-attributes>
-      <empty-value-valid>true</empty-value-valid>
-    </value-attributes>
-    <depends-on>
-      <property>
-        <type>ranger-admin-site</type>
-        <name>ranger.audit.solr.urls</name>
-      </property>
-    </depends-on>
-  </property>
-
-  <property>
-    <name>xasecure.audit.destination.solr.zookeepers</name>
-    <value>NONE</value>
-    <description>Solr Zookeeper string</description>
-    <depends-on>
-      <property>
-        <type>ranger-admin-site</type>
-        <name>ranger.audit.solr.zookeepers</name>
-      </property>
-    </depends-on>
-  </property>
-
-  <property>
-    <name>xasecure.audit.destination.solr.batch.filespool.dir</name>
-    <value>/var/log/knox/audit/solr/spool</value>
-    <description>/var/log/knox/audit/solr/spool</description>
-  </property>
-  -->
-    
-  <property>
-    <name>xasecure.audit.provider.summary.enabled</name>
-    <value>false</value>
-    <display-name>Audit provider summary enabled</display-name>
-    <description>Enable Summary audit?</description>
-    <value-attributes>
-      <type>boolean</type>
-    </value-attributes>
-  </property>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ranger-knox-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ranger-knox-plugin-properties.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ranger-knox-plugin-properties.xml
deleted file mode 100644
index e6d62ed..0000000
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ranger-knox-plugin-properties.xml
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-<configuration supports_final="true">
-
-  <property>
-    <name>policy_user</name>
-    <value>ambari-qa</value>
-    <display-name>Policy user for KNOX</display-name>
-    <description>This user must be system user and also present at Ranger admin portal</description>
-  </property> 
-
-  <property>
-    <name>common.name.for.certificate</name>
-    <value></value>
-    <description>Common name for certificate, this value should match what is specified in repo within ranger admin</description>
-    <value-attributes>
-      <empty-value-valid>true</empty-value-valid>
-    </value-attributes>
-  </property>
-
-  <property>
-    <name>ranger-knox-plugin-enabled</name>
-    <value>No</value>
-    <display-name>Enable Ranger for KNOX</display-name>
-    <description>Enable ranger knox plugin ?</description>
-    <depends-on>
-      <property>
-        <type>ranger-env</type>
-        <name>ranger-knox-plugin-enabled</name>
-      </property>
-    </depends-on>
-    <value-attributes>
-      <type>boolean</type>
-      <overridable>false</overridable>
-    </value-attributes>
-  </property>
-
-  <property>
-    <name>REPOSITORY_CONFIG_USERNAME</name>
-    <value>admin</value>
-    <display-name>Ranger repository config user</display-name>
-    <description>Used for repository creation on ranger admin</description>
-  </property> 
-
-  <property>
-    <name>REPOSITORY_CONFIG_PASSWORD</name>
-    <value>admin-password</value>
-    <display-name>Ranger repository config password</display-name>
-    <property-type>PASSWORD</property-type>
-    <description>Used for repository creation on ranger admin</description>
-  </property> 
-
-  <property>
-    <name>KNOX_HOME</name>
-    <value>/usr/iop/current/knox-server</value>
-    <display-name>Knox Home</display-name>
-    <description>Knox home folder</description>
-  </property>
-  
-  <!-- Properties from HDP 2.3 --> 
-  <!-- Because of how IOP stack inheritance is organized, 
-  the following properties have to be manually commented out. 
-  The delete tag does not work like in HDP. These are kept here just for completeness.--> 
- <!--  
-  <property>
-    <name>XAAUDIT.DB.IS_ENABLED</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>XAAUDIT.HDFS.IS_ENABLED</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>XAAUDIT.HDFS.DESTINATION_DIRECTORY</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>XAAUDIT.HDFS.LOCAL_BUFFER_DIRECTORY</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>XAAUDIT.HDFS.LOCAL_ARCHIVE_DIRECTORY</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>XAAUDIT.HDFS.DESTINTATION_FILE</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>XAAUDIT.HDFS.DESTINTATION_FLUSH_INTERVAL_SECONDS</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>XAAUDIT.HDFS.DESTINTATION_ROLLOVER_INTERVAL_SECONDS</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>XAAUDIT.HDFS.LOCAL_BUFFER_FILE</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>XAAUDIT.HDFS.LOCAL_BUFFER_FLUSH_INTERVAL_SECONDS</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>XAAUDIT.HDFS.LOCAL_BUFFER_ROLLOVER_INTERVAL_SECONDS</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>XAAUDIT.HDFS.LOCAL_ARCHIVE_MAX_FILE_COUNT</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>SSL_KEYSTORE_FILE_PATH</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>SSL_KEYSTORE_PASSWORD</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>SSL_TRUSTSTORE_FILE_PATH</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>SSL_TRUSTSTORE_PASSWORD</name>
-    <deleted>true</deleted>
-  </property>
-  
-  <property>
-    <name>POLICY_MGR_URL</name>
-    <deleted>true</deleted>    
-  </property> 
-  
-  <property>
-    <name>SQL_CONNECTOR_JAR</name>
-    <deleted>true</deleted>  
-  </property> 
-  
-  <property>
-    <name>XAAUDIT.DB.FLAVOUR</name>
-    <deleted>true</deleted>    
-  </property> 
-  
-  <property>
-    <name>XAAUDIT.DB.DATABASE_NAME</name>
-    <deleted>true</deleted>   
-  </property> 
-  
-  <property>
-    <name>XAAUDIT.DB.USER_NAME</name>
-    <deleted>true</deleted>   
-  </property> 
-  
-  <property>
-    <name>XAAUDIT.DB.PASSWORD</name>
-    <deleted>true</deleted>    
-  </property>
-  
-  <property>
-    <name>XAAUDIT.DB.HOSTNAME</name>
-    <deleted>true</deleted>   
-  </property>
-  
-  <property>
-    <name>REPOSITORY_NAME</name>
-    <deleted>true</deleted>    
-  </property>
-  
- -->
-
-</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ranger-knox-policymgr-ssl.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ranger-knox-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ranger-knox-policymgr-ssl.xml
deleted file mode 100644
index 18d1c07..0000000
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ranger-knox-policymgr-ssl.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-<configuration>
-  
-  <property>
-    <name>xasecure.policymgr.clientssl.keystore</name>
-    <value>/usr/iop/current/knox-server/conf/ranger-plugin-keystore.jks</value>
-    <description>Java Keystore files</description>
-  </property>
-
-  <property>
-    <name>xasecure.policymgr.clientssl.keystore.password</name>
-    <value>myKeyFilePassword</value>
-    <property-type>PASSWORD</property-type>
-    <description>password for keystore</description>
-  </property>
-
-  <property>
-    <name>xasecure.policymgr.clientssl.truststore</name>
-    <value>/usr/iop/current/knox-server/conf/ranger-plugin-truststore.jks</value>
-    <description>java truststore file</description>
-  </property>
-
-  <property>
-    <name>xasecure.policymgr.clientssl.truststore.password</name>
-    <value>changeit</value>
-    <property-type>PASSWORD</property-type>
-    <description>java  truststore password</description>
-  </property>
-
-    <property>
-    <name>xasecure.policymgr.clientssl.keystore.credential.file</name>
-    <value>jceks://file{{credential_file}}</value>
-    <description>java  keystore credential file</description>
-  </property>
-
-  <property>
-    <name>xasecure.policymgr.clientssl.truststore.credential.file</name>
-    <value>jceks://file{{credential_file}}</value>
-    <description>java  truststore credential file</description>
-  </property>
-
-</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ranger-knox-security.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ranger-knox-security.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ranger-knox-security.xml
deleted file mode 100644
index cc1ce9f..0000000
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ranger-knox-security.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-<configuration>
-  
-  <property>
-    <name>ranger.plugin.knox.service.name</name>
-    <value>{{repo_name}}</value>
-    <description>Name of the Ranger service containing policies for this Knox instance</description>
-  </property>
-
-  <property>
-    <name>ranger.plugin.knox.policy.source.impl</name>
-    <value>org.apache.ranger.admin.client.RangerAdminJersey2RESTClient</value>
-    <description>Class to retrieve policies from the source</description>
-  </property>
-
-  <property>
-    <name>ranger.plugin.knox.policy.rest.url</name>
-    <value>{{policymgr_mgr_url}}</value>
-    <description>URL to Ranger Admin</description>
-  </property>
-
-  <property>
-    <name>ranger.plugin.knox.policy.rest.ssl.config.file</name>
-    <value>/usr/iop/current/knox-server/conf/ranger-policymgr-ssl.xml</value>
-    <description>Path to the file containing SSL details to contact Ranger Admin</description>
-  </property>
-
-  <property>
-    <name>ranger.plugin.knox.policy.pollIntervalMs</name>
-    <value>30000</value>
-    <description>How often to poll for changes in policies?</description>
-  </property>
-
-  <property>
-    <name>ranger.plugin.knox.policy.cache.dir</name>
-    <value>/etc/ranger/{{repo_name}}/policycache</value>
-    <description>Directory where Ranger policies are cached after successful retrieval from the source</description>
-  </property>
-
-</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/topology.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/topology.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/topology.xml
deleted file mode 100644
index 4c0c91c..0000000
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/topology.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration supports_final="false" supports_adding_forbidden="true">
-    <!-- topology file -->
-
-    <property>
-    <name>content</name>
-    <value>
-        &lt;topology&gt;
-
-            &lt;gateway&gt;
-
-                &lt;provider&gt;
-                    &lt;role&gt;authentication&lt;/role&gt;
-                    &lt;name&gt;ShiroProvider&lt;/name&gt;
-                    &lt;enabled&gt;true&lt;/enabled&gt;
-                    &lt;param&gt;
-                        &lt;name&gt;sessionTimeout&lt;/name&gt;
-                        &lt;value&gt;30&lt;/value&gt;
-                    &lt;/param&gt;
-                    &lt;param&gt;
-                        &lt;name&gt;main.ldapRealm&lt;/name&gt;
-                        &lt;value&gt;org.apache.hadoop.gateway.shirorealm.KnoxLdapRealm&lt;/value&gt;
-                    &lt;/param&gt;
-                    &lt;param&gt;
-                        &lt;name&gt;main.ldapRealm.userDnTemplate&lt;/name&gt;
-                        &lt;value&gt;uid={0},ou=people,dc=hadoop,dc=apache,dc=org&lt;/value&gt;
-                    &lt;/param&gt;
-                    &lt;param&gt;
-                        &lt;name&gt;main.ldapRealm.contextFactory.url&lt;/name&gt;
-                        &lt;value&gt;ldap://{{knox_host_name}}:33389&lt;/value&gt;
-                    &lt;/param&gt;
-                    &lt;param&gt;
-                        &lt;name&gt;main.ldapRealm.contextFactory.authenticationMechanism&lt;/name&gt;
-                        &lt;value&gt;simple&lt;/value&gt;
-                    &lt;/param&gt;
-                    &lt;param&gt;
-                        &lt;name&gt;urls./**&lt;/name&gt;
-                        &lt;value&gt;authcBasic&lt;/value&gt;
-                    &lt;/param&gt;
-                &lt;/provider&gt;
-
-                &lt;provider&gt;
-                    &lt;role&gt;identity-assertion&lt;/role&gt;
-                    &lt;name&gt;Default&lt;/name&gt;
-                    &lt;enabled&gt;true&lt;/enabled&gt;
-                &lt;/provider&gt;
-
-            &lt;/gateway&gt;
-
-            &lt;service&gt;
-                &lt;role&gt;NAMENODE&lt;/role&gt;
-                &lt;url&gt;hdfs://{{namenode_host}}:{{namenode_rpc_port}}&lt;/url&gt;
-            &lt;/service&gt;
-
-            &lt;service&gt;
-                &lt;role&gt;JOBTRACKER&lt;/role&gt;
-                &lt;url&gt;rpc://{{rm_host}}:{{jt_rpc_port}}&lt;/url&gt;
-            &lt;/service&gt;
-
-            &lt;service&gt;
-                &lt;role&gt;WEBHDFS&lt;/role&gt;
-                &lt;url&gt;{{hdfs_scheme}}://{{namenode_host}}:{{namenode_http_port}}/webhdfs&lt;/url&gt;
-            &lt;/service&gt;
-
-            &lt;service&gt;
-                &lt;role&gt;WEBHCAT&lt;/role&gt;
-                &lt;url&gt;{{webhcat_scheme}}://{{webhcat_server_host}}:{{templeton_port}}/templeton&lt;/url&gt;
-            &lt;/service&gt;
-
-            &lt;service&gt;
-                &lt;role&gt;OOZIE&lt;/role&gt;
-                &lt;url&gt;{{oozie_scheme}}://{{oozie_server_host}}:{{oozie_server_port}}/oozie&lt;/url&gt;
-            &lt;/service&gt;
-            &lt;service&gt;
-                &lt;role&gt;FALCON&lt;/role&gt;
-                &lt;url&gt;{{falcon_scheme}}://{{falcon_server_host}}:{{falcon_server_port}}&lt;/url&gt;
-            &lt;/service&gt;
-
-            &lt;service&gt;
-                &lt;role&gt;WEBHBASE&lt;/role&gt;
-                &lt;url&gt;{{hbase_master_scheme}}://{{hbase_master_host}}:{{hbase_master_port}}&lt;/url&gt;
-            &lt;/service&gt;
-
-            &lt;service&gt;
-                &lt;role&gt;HIVE&lt;/role&gt;
-                &lt;url&gt;{{hive_scheme}}://{{hive_server_host}}:{{hive_http_port}}/{{hive_http_path}}&lt;/url&gt;
-            &lt;/service&gt;
-
-            &lt;service&gt;
-                &lt;role&gt;RESOURCEMANAGER&lt;/role&gt;
-                &lt;url&gt;{{yarn_scheme}}://{{rm_host}}:{{rm_port}}/ws&lt;/url&gt;
-            &lt;/service&gt;
-
-            &lt;service&gt; 
-                &lt;role&gt;HDFSUI&lt;/role&gt; 
-                &lt;url&gt;{{hdfs_scheme}}://{{namenode_host}}:{{namenode_http_port}}&lt;/url&gt; 
-            &lt;/service&gt; 
- 
-            &lt;service&gt; 
-                &lt;role&gt;HBASEUI&lt;/role&gt; 
-                &lt;url&gt;{{hbase_master_scheme}}://{{hbase_master_host}}:{{hbase_master_ui_port}}&lt;/url&gt; 
-            &lt;/service&gt; 
-
-            &lt;service&gt;
-                &lt;role&gt;SOLR&lt;/role&gt;
-                &lt;url&gt;{{solr_scheme}}://{{solr_host}}:{{solr_port}}/solr&lt;/url&gt;
-            &lt;/service&gt;
- 
-            &lt;service&gt; 
-                &lt;role&gt;SPARKUI&lt;/role&gt; 
-                &lt;url&gt;{{spark_scheme}}://{{spark_historyserver_host}}:{{spark_historyserver_ui_port}}&lt;/url&gt; 
-            &lt;/service&gt; 
- 
-            &lt;service&gt; 
-                &lt;role&gt;OOZIEUI&lt;/role&gt; 
-                &lt;url&gt;{{oozie_scheme}}://{{oozie_server_host}}:{{oozie_server_port}}/oozie&lt;/url&gt; 
-            &lt;/service&gt;
-
-            &lt;service&gt;
-                &lt;role&gt;FALCONUI&lt;/role&gt;
-                &lt;url&gt;{{falcon_scheme}}://{{falcon_server_host}}:{{falcon_server_port}}&lt;/url&gt;
-            &lt;/service&gt;
-
-            &lt;service&gt; 
-                &lt;role&gt;YARNUI&lt;/role&gt; 
-                &lt;url&gt;{{yarn_scheme}}://{{rm_host}}:{{rm_port}}&lt;/url&gt; 
-            &lt;/service&gt; 
- 
-            &lt;service&gt; 
-                &lt;role&gt;JOBSTORYUI&lt;/role&gt; 
-                &lt;url&gt;{{mr_scheme}}://{{mr_historyserver_address}}&lt;/url&gt; 
-            &lt;/service&gt; 
- 
-            &lt;service&gt; 
-                &lt;role&gt;NODEUI&lt;/role&gt; 
-                &lt;url&gt;{{nodeui_scheme}}://{{nm_host}}:{{nodeui_port}}&lt;/url&gt; 
-            &lt;/service&gt; 
-
-            &lt;service&gt;
-              &lt;role&gt;THRIFTSERVERUI&lt;/role&gt;
-              &lt;url&gt;{{spark_thriftserver_scheme}}://{{spark_thriftserver_host}}:{{spark_thriftserver_ui_port}}&lt;/url&gt;
-            &lt;/service&gt;
-
-        &lt;/topology&gt;
-    </value>
-    <description>
-        The configuration specifies the Hadoop cluster services Knox will provide access to.
-    </description>
-    <value-attributes>
-       <empty-value-valid>true</empty-value-valid>
-       <show-property-name>false</show-property-name>
-    </value-attributes>
-        <depends-on>
-            <property>
-                <type>ranger-knox-plugin-properties</type>
-                <name>ranger-knox-plugin-enabled</name>
-            </property>
-        </depends-on>
-    </property>
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/users-ldif.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/users-ldif.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/users-ldif.xml
deleted file mode 100644
index 6f6fa54..0000000
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/users-ldif.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration supports_final="false" supports_adding_forbidden="true">
-
-    <property>
-        <name>content</name>
-        <value>
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-version: 1
-
-# Please replace with site specific values
-dn: dc=hadoop,dc=apache,dc=org
-objectclass: organization
-objectclass: dcObject
-o: Hadoop
-dc: hadoop
-
-# Entry for a sample people container
-# Please replace with site specific values
-dn: ou=people,dc=hadoop,dc=apache,dc=org
-objectclass:top
-objectclass:organizationalUnit
-ou: people
-
-# Entry for a sample end user
-# Please replace with site specific values
-dn: uid=guest,ou=people,dc=hadoop,dc=apache,dc=org
-objectclass:top
-objectclass:person
-objectclass:organizationalPerson
-objectclass:inetOrgPerson
-cn: Guest
-sn: User
-uid: guest
-userPassword:guest-password
-
-# entry for sample user admin
-dn: uid=admin,ou=people,dc=hadoop,dc=apache,dc=org
-objectclass:top
-objectclass:person
-objectclass:organizationalPerson
-objectclass:inetOrgPerson
-cn: Admin
-sn: Admin
-uid: admin
-userPassword:admin-password
-
-# entry for sample user sam
-dn: uid=sam,ou=people,dc=hadoop,dc=apache,dc=org
-objectclass:top
-objectclass:person
-objectclass:organizationalPerson
-objectclass:inetOrgPerson
-cn: sam
-sn: sam
-uid: sam
-userPassword:sam-password
-
-# entry for sample user tom
-dn: uid=tom,ou=people,dc=hadoop,dc=apache,dc=org
-objectclass:top
-objectclass:person
-objectclass:organizationalPerson
-objectclass:inetOrgPerson
-cn: tom
-sn: tom
-uid: tom
-userPassword:tom-password
-
-# create FIRST Level groups branch
-dn: ou=groups,dc=hadoop,dc=apache,dc=org
-objectclass:top
-objectclass:organizationalUnit
-ou: groups
-description: generic groups branch
-
-# create the analyst group under groups
-dn: cn=analyst,ou=groups,dc=hadoop,dc=apache,dc=org
-objectclass:top
-objectclass: groupofnames
-cn: analyst
-description:analyst  group
-member: uid=sam,ou=people,dc=hadoop,dc=apache,dc=org
-member: uid=tom,ou=people,dc=hadoop,dc=apache,dc=org
-
-
-# create the scientist group under groups
-dn: cn=scientist,ou=groups,dc=hadoop,dc=apache,dc=org
-objectclass:top
-objectclass: groupofnames
-cn: scientist
-description: scientist group
-member: uid=sam,ou=people,dc=hadoop,dc=apache,dc=org
-
-        </value>
-        <description>
-            content for users-ldif file for the demo LDAP that comes with Knox.
-        </description>
-        <value-attributes>
-          <show-property-name>false</show-property-name>
-        </value-attributes>
-    </property>
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/kerberos.json b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/kerberos.json
deleted file mode 100644
index 446f5ef..0000000
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/kerberos.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  "services": [
-    {
-      "name": "KNOX",
-      "components": [
-        {
-          "name": "KNOX_GATEWAY",
-          "identities": [
-            {
-              "name": "knox_principal",
-              "principal": {
-                "value": "${knox-env/knox_user}/_HOST@${realm}",
-                "type" : "service",
-                "configuration": "knox-env/knox_principal_name",
-                "local_username": "${knox-env/knox_user}"
-
-              },
-              "keytab": {
-                "file": "${keytab_dir}/knox.service.keytab",
-                "owner": {
-                  "name": "${knox-env/knox_user}",
-                  "access": "r"
-                },
-                "group": {
-                  "name": "${cluster-env/user_group}",
-                  "access": ""
-                },
-                "configuration": "knox-env/knox_keytab_path"
-              }
-            }
-          ],
-          "configurations": [
-            {
-              "gateway-site": {
-                "gateway.hadoop.kerberos.secured": "true",
-                "java.security.krb5.conf": "/etc/krb5.conf"
-              }
-            },
-            {
-              "core-site": {
-                "hadoop.proxyuser.knox.groups": "${hadoop-env/proxyuser_group}",
-                "hadoop.proxyuser.knox.hosts": "${host}"
-              }
-            },
-            {
-              "webhcat-site": {
-                "webhcat.proxyuser.knox.groups": "${hadoop-env/proxyuser_group}",
-                "webhcat.proxyuser.knox.hosts": "${host}"
-              }
-            },
-            {
-              "oozie-site": {
-                "oozie.service.ProxyUserService.proxyuser.knox.groups": "${hadoop-env/proxyuser_group}",
-                "oozie.service.ProxyUserService.proxyuser.knox.hosts": "${host}"
-              }
-            },
-            {
-              "falcon-runtime.properties": {
-                "*.falcon.service.ProxyUserService.proxyuser.knox.groups": "${hadoop-env/proxyuser_group}",
-                "*.falcon.service.ProxyUserService.proxyuser.knox.hosts": "${host}"
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/metainfo.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/metainfo.xml
deleted file mode 100644
index 3fe3cad..0000000
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/metainfo.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>KNOX</name>
-      <displayName>Knox</displayName>
-      <comment>Provides a single point of authentication and access for Apache Hadoop services in a cluster</comment>
-      <version>0.7.0</version>
-      <components>
-        <component>
-          <name>KNOX_GATEWAY</name>
-          <displayName>Knox Gateway</displayName>
-          <category>MASTER</category>
-          <cardinality>1+</cardinality>
-          <versionAdvertised>true</versionAdvertised>
-          <commandScript>
-            <script>scripts/knox_gateway.py</script>
-            <scriptType>PYTHON</scriptType>
-            <timeout>600</timeout>
-          </commandScript>
-            <customCommands>
-                <customCommand>
-                    <name>STARTDEMOLDAP</name>
-                    <commandScript>
-                        <script>scripts/demo_ldap.py</script>
-                        <scriptType>PYTHON</scriptType>
-                        <timeout>600</timeout>
-                    </commandScript>
-                </customCommand>
-                <customCommand>
-                    <name>STOPDEMOLDAP</name>
-                    <commandScript>
-                        <script>scripts/demo_ldap.py</script>
-                        <scriptType>PYTHON</scriptType>
-                        <timeout>600</timeout>
-                    </commandScript>
-                </customCommand>
-            </customCommands>
-        </component>
-      </components>
-      <osSpecifics>
-        <osSpecific>
-          <osFamily>redhat7,redhat6,suse11</osFamily>
-          <packages>
-            <package>
-              <name>knox_4_2_*</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>ubuntu12</osFamily>
-          <packages>
-            <package>
-              <name>knox_4_2_*</name>
-            </package>
-          </packages>
-        </osSpecific>
-      </osSpecifics>
-      <commandScript>
-        <script>scripts/service_check.py</script>
-        <scriptType>PYTHON</scriptType>
-        <timeout>300</timeout>
-      </commandScript>
-      <configuration-dependencies>
-        <config-type>gateway-site</config-type>
-        <config-type>gateway-log4j</config-type>
-        <config-type>topology</config-type>
-        <config-type>ranger-knox-plugin-properties</config-type>
-        <config-type>ranger-knox-audit</config-type>
-        <config-type>ranger-knox-policymgr-ssl</config-type>
-        <config-type>ranger-knox-security</config-type>
-      </configuration-dependencies>
-    </service>
-  </services>
-</metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/package/files/validateKnoxStatus.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/package/files/validateKnoxStatus.py b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/package/files/validateKnoxStatus.py
deleted file mode 100644
index 257abfb..0000000
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/package/files/validateKnoxStatus.py
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env python
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-import optparse
-import socket
-
-#
-# Main.
-#
-def main():
-  parser = optparse.OptionParser(usage="usage: %prog [options]")
-  parser.add_option("-p", "--port", dest="port", help="Port for Knox process")
-  parser.add_option("-n", "--hostname", dest="hostname", help="Hostname of Knox Gateway component")
-
-  (options, args) = parser.parse_args()
-  timeout_seconds = 5
-  try:
-    s = socket.create_connection((options.hostname, int(options.port)),timeout=timeout_seconds)
-    print "Successfully connected to %s on port %s" % (options.hostname, options.port)
-    s.close()
-  except socket.error, e:
-    print "Connection to %s on port %s failed: %s" % (options.hostname, options.port, e)
-    exit(1)
-
-if __name__ == "__main__":
-  main()
-


Mime
View raw message