ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maha...@apache.org
Subject [50/51] [partial] ambari git commit: Revert "[RTC 136620]: Introduce BigInsights stacks on Ambari 2.4 branch"
Date Wed, 17 Aug 2016 05:41:39 GMT
http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/common-services/SOLR/5.1.0.4.1/package/scripts/solr_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SOLR/5.1.0.4.1/package/scripts/solr_service.py b/ambari-server/src/main/resources/common-services/SOLR/5.1.0.4.1/package/scripts/solr_service.py
deleted file mode 100644
index 866a31c..0000000
--- a/ambari-server/src/main/resources/common-services/SOLR/5.1.0.4.1/package/scripts/solr_service.py
+++ /dev/null
@@ -1,59 +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 resource_management import *
-
-def solr_service(action='start'):
-  import params
-  cmd = format("{solr_home}/bin/solr")
-
-  if action == 'start':
-
-    if params.security_enabled:
-      if params.solr_principal is None:
-        solr_principal_with_host = 'missing_principal'
-      else:
-        solr_principal_with_host = params.solr_principal.replace("_HOST", params.hostname)
-      kinit_cmd = format("{kinit_path_local} -kt {solr_keytab} {solr_principal_with_host};")
-      Execute(kinit_cmd,user=params.solr_user)
-
-    Execute (params.solr_home+'/server/scripts/cloud-scripts/zkcli.sh -zkhost ' + params.zookeeper_hosts_list + ' -cmd makepath ' + params.zookeeper_chroot, user=params.solr_user, ignore_failures=True )
-
-    if (params.upgrade_direction is not None and params.upgrade_direction == Direction.UPGRADE) or (compare_versions(format_hdp_stack_version(params.current_version), '4.2.0.0') >= 0):
-      solr_home_dir = params.solr_data_dir
-    else:
-      solr_home_dir = params.lib_dir + "/data"
-
-    daemon_cmd = format("SOLR_INCLUDE={solr_conf_dir}/solr.in.sh {cmd} start -c -s {solr_home_dir} -V")
-    no_op_test = format("ls {solr_pid_file} >/dev/null 2>&1 && ps `cat {solr_pid_file}` >/dev/null 2>&1")
-    Execute(daemon_cmd,
-            not_if=no_op_test,
-            user=params.solr_user
-    )
-  elif action == 'stop':
-    daemon_cmd = format("SOLR_INCLUDE={solr_conf_dir}/solr.in.sh {cmd} stop")
-    no_op_test = format("! ((`SOLR_INCLUDE={solr_conf_dir}/solr.in.sh {cmd} status |grep process |wc -l`))")
-    rm_pid = format("rm -f {solr_pid_file}")
-    Execute(daemon_cmd,
-            not_if=no_op_test,
-            user=params.solr_user
-    )
-    Execute(rm_pid)

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/common-services/SOLR/5.1.0.4.1/package/scripts/solr_upgrade.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SOLR/5.1.0.4.1/package/scripts/solr_upgrade.py b/ambari-server/src/main/resources/common-services/SOLR/5.1.0.4.1/package/scripts/solr_upgrade.py
deleted file mode 100644
index f3eab39..0000000
--- a/ambari-server/src/main/resources/common-services/SOLR/5.1.0.4.1/package/scripts/solr_upgrade.py
+++ /dev/null
@@ -1,135 +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.
-
-"""
-import os
-from resource_management import *
-from resource_management.core.logger import Logger
-from resource_management.core.resources.system import Execute
-from resource_management.libraries.functions import conf_select
-from resource_management.libraries.functions import get_unique_id_and_date
-
-class SolrServerUpgrade(Script):
-  def pre_upgrade_conf41(self, env):
-    """
-    Create /etc/solr/4.1.0.0/0 directory and copies Solr config files here.
-    Create symlinks accordingly.
-
-    conf-select create-conf-dir --package solr --stack-version 4.1.0.0 --conf-version 0
-    cp -r /usr/iop/4.1.0.0/solr/conf/* /etc/solr/4.1.0.0/0/.
-    unlink or rm -r /usr/iop/4.1.0.0/solr/conf
-    ln -s /etc/solr/4.1.0.0/0 /usr/iop/4.1.0.0/solr/conf
-    conf-select set-conf-dir --package solr --stack-version 4.1.0.0 --conf-version 0
-    """
-    import params
-    env.set_params(params)
-
-    solr41_conf_dir="/usr/iop/4.1.0.0/solr/conf"
-    solr41_etc_dir="/etc/solr/4.1.0.0/0"
-    if not os.path.exists(solr41_etc_dir):
-      conf_select.create(params.stack_name, "solr", "4.1.0.0")
-
-    content_path=solr41_conf_dir
-    if not os.path.isfile("/usr/iop/4.1.0.0/solr/conf/solr.in.sh"):
-      content_path = "/etc/solr/conf.backup"
-
-    for each in os.listdir(content_path):
-      File(os.path.join(solr41_etc_dir, each),
-           owner=params.solr_user,
-           content = StaticFile(os.path.join(content_path, each)))
-
-    if not os.path.islink(solr41_conf_dir):
-      Directory(solr41_conf_dir,
-                action="delete",
-                recursive=True)
-
-    if os.path.islink(solr41_conf_dir):
-      os.unlink(solr41_conf_dir)
-
-    if not os.path.islink(solr41_conf_dir):
-      Link(solr41_conf_dir,
-           to=solr41_etc_dir
-      )
-
-    conf_select.select(params.stack_name, "solr", "4.1.0.0")
-
-  def pre_stop_backup_cores(self, env):
-    """
-    Backs up the Solr cores under Solr's home directory.
-    cp -r /var/lib/solr/data/* /tmp/solr/cores
-    """
-    import params
-    env.set_params(params)
-
-    if compare_versions(format_hdp_stack_version(params.current_version), '4.2.0.0') >= 0:
-      solr_home_dir=params.solr_data_dir
-    else: #4.1.0.0
-      solr_home_dir=params.old_lib_dir + "/data"
-
-    unique = get_unique_id_and_date()
-    backup_solr_dir="/tmp/upgrades/{0}/solr_{1}".format(params.current_version, unique)
-    backup_solr_cores="/tmp/solr/cores"
-
-    if os.path.isdir(solr_home_dir) and not os.path.isdir(backup_solr_dir):
-      os.makedirs(backup_solr_dir)
-      Execute(('cp', '-r', solr_home_dir+"/.", backup_solr_dir),
-              sudo=True
-      )
-
-    if params.upgrade_direction is not None and params.upgrade_direction == Direction.UPGRADE:
-      Directory(backup_solr_cores,
-                action="delete",
-                recursive=True)
-
-      Directory(backup_solr_cores,
-                mode=0755,
-                cd_access='a',
-                owner=params.solr_user,
-                recursive=True,
-                group=params.user_group
-      )
-
-      Execute(('cp', '-r', solr_home_dir+"/.", backup_solr_cores),
-              user=params.solr_user
-      )
-
-  def pre_start_migrate_cores(self, env):
-    """
-    Copy the Solr cores from previous version to the new Solr home directory if solr_home is a differnet directory.
-    cp -r /tmp/solr/cores/* /opt/solr/data/.
-    """
-    import params
-    env.set_params(params)
-
-    if params.upgrade_direction is not None and params.upgrade_direction == Direction.UPGRADE:
-      backup_solr_cores="/tmp/solr/cores"
-      solr_home_dir=params.solr_data_dir
-
-      Directory(format(solr_home_dir),
-                owner=params.solr_user,
-                recursive=True,
-                group=params.user_group
-      )
-
-      if os.path.isdir(solr_home_dir) and os.path.isdir(backup_solr_cores):
-        Execute(('cp', '-rn', backup_solr_cores+"/.", solr_home_dir),
-                 user=params.solr_user,
-                 logoutput=True
-        )
-
-if __name__ == "__main__":
-  SolrServerUpgrade().execute()

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/common-services/SOLR/5.1.0.4.1/package/scripts/status_params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SOLR/5.1.0.4.1/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/SOLR/5.1.0.4.1/package/scripts/status_params.py
deleted file mode 100644
index 5bd0000..0000000
--- a/ambari-server/src/main/resources/common-services/SOLR/5.1.0.4.1/package/scripts/status_params.py
+++ /dev/null
@@ -1,32 +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.
-
-"""
-
-from resource_management import *
-import status_params
-
-config = Script.get_config()
-
-solr_user = config['configurations']['solr-env']['solr_user']
-hostname = config['hostname']
-kinit_path_local = functions.get_kinit_path()
-tmp_dir = Script.get_tmp_dir()
-solr_pid_dir = config['configurations']['solr-env']['solr_pid_dir']
-solr_port = config['configurations']['solr-env']['solr_port']
-solr_pid_file = format("{solr_pid_dir}/solr-{solr_port}.pid")

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/common-services/SOLR/5.1.0.4.1/package/templates/solr.xml.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SOLR/5.1.0.4.1/package/templates/solr.xml.j2 b/ambari-server/src/main/resources/common-services/SOLR/5.1.0.4.1/package/templates/solr.xml.j2
deleted file mode 100644
index e247452..0000000
--- a/ambari-server/src/main/resources/common-services/SOLR/5.1.0.4.1/package/templates/solr.xml.j2
+++ /dev/null
@@ -1,51 +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.
--->
-
-<!--
-   This is an example of a simple "solr.xml" file for configuring one or 
-   more Solr Cores, as well as allowing Cores to be added, removed, and 
-   reloaded via HTTP requests.
-
-   More information about options available in this configuration file, 
-   and Solr Core administration can be found online:
-   http://wiki.apache.org/solr/CoreAdmin
--->
-
-<solr>
-
-  <solrcloud>
-
-    <str name="host">${host:}</str>
-    <int name="hostPort">${jetty.port:8983}</int>
-    <str name="hostContext">${hostContext:solr}</str>
-
-    <bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
-
-    <int name="zkClientTimeout">${zkClientTimeout:30000}</int>
-    <int name="distribUpdateSoTimeout">${distribUpdateSoTimeout:600000}</int>
-    <int name="distribUpdateConnTimeout">${distribUpdateConnTimeout:60000}</int>
-
-  </solrcloud>
-
-  <shardHandlerFactory name="shardHandlerFactory"
-    class="HttpShardHandlerFactory">
-    <int name="socketTimeout">${socketTimeout:600000}</int>
-    <int name="connTimeout">${connTimeout:60000}</int>
-  </shardHandlerFactory>
-
-</solr>

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/configuration/solr-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/configuration/solr-env.xml b/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/configuration/solr-env.xml
deleted file mode 100755
index 4da0e0e..0000000
--- a/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/configuration/solr-env.xml
+++ /dev/null
@@ -1,234 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<configuration>
-   <property>
-    <name>solr_user</name>
-    <description>User to run Solr as</description>
-    <property-type>USER</property-type>
-    <value>solr</value>
-  </property>
-  
-  <property>
-    <name>solr_data_dir</name>
-    <value>/opt/solr/data</value>
-    <description>Solr Home Directory for writable Solr files and index data</description>
-  </property>
-
-  <property>
-    <name>solr_pid_dir</name>
-    <value>/var/run/solr</value>
-  </property>
-
-  <property>
-    <name>solr_log_dir</name>
-    <value>/var/log/solr</value>
-  </property>
-
-  <property>
-    <name>solr_port</name>
-    <value>8983</value>
-    <description>Sets the port Solr binds to, default is 8983</description>
-  </property>
-
-  <property>
-    <name>solr_hdfs_home_dir</name>
-    <value>/apps/solr/data</value>
-    <description>A root location in HDFS for Solr to write collection data to. Rather than specifying an HDFS location for the data directory or update log directory, use this to specify one root location and have everything automatically created within this HDFS</description>
-  </property>
-
-  
-  <property>
-    <name>ZOOKEEPER_CHROOT</name>
-    <value>/solr</value>
-    <description>If you're using a ZooKeeper instance that is shared by other systems, it's recommended to isolate the SolrCloud znode tree using ZooKeeper's chroot support. 
-    For instance, to ensure all znodes created by SolrCloud are stored under /solr, you can put /solr on the end of your ZK_HOST connection string, such as: ZK_HOST=zk1,zk2,zk3/solr</description>
-  </property>
-
-  <property>
-      <name>solr_xms_minmem</name>
-      <value>512</value>
-      <description>Set Xms value for Solr in MB</description>
-      <value-attributes>
-          <type>int</type>
-          <minimum>0</minimum>
-          <maximum>268435456</maximum>
-          <unit>MB</unit>
-          <increment-step>1</increment-step>
-      </value-attributes>
-  </property>
-
-  <property>
-      <name>solr_xmx_maxmem</name>
-      <value>512</value>
-      <description>Set Xmx value for Solr in MB</description>
-      <value-attributes>
-          <type>int</type>
-          <minimum>{{solr_xms_minmem}}</minimum>
-          <maximum>268435456</maximum>
-          <unit>MB</unit>
-          <increment-step>1</increment-step>
-      </value-attributes>
-  </property>
-
- <property>
-    <name>content</name>
-    <description>This is the jinja template for solr.in.sh file</description>
-    <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.
-
-
-export JAVA_HOME={{java64_home}}
-
-# By default the script will use JAVA_HOME to determine which java
-# to use, but you can set a specific path for Solr to use without
-# affecting other Java applications on your server/workstation.
-#SOLR_JAVA_HOME=""
-
-
-
-# Increase Java Min/Max Heap as needed to support your indexing / query needs
-SOLR_JAVA_MEM="-Xms{{solr_xms_minmem}}m -Xmx{{solr_xmx_maxmem}}m"
-
-# Enable verbose GC logging
-GC_LOG_OPTS="-verbose:gc -XX:+PrintHeapAtGC -XX:+PrintGCDetails \
--XX:+PrintGCDateStamps -XX:+PrintGCTimeStamps -XX:+PrintTenuringDistribution -XX:+PrintGCApplicationStoppedTime"
-
-
-# These GC settings have shown to work well for a number of common Solr workloads
-GC_TUNE="-XX:NewRatio=3 \
--XX:SurvivorRatio=4 \
--XX:TargetSurvivorRatio=90 \
--XX:MaxTenuringThreshold=8 \
--XX:+UseConcMarkSweepGC \
--XX:+UseParNewGC \
--XX:ConcGCThreads=4 -XX:ParallelGCThreads=4 \
--XX:+CMSScavengeBeforeRemark \
--XX:PretenureSizeThreshold=64m \
--XX:+UseCMSInitiatingOccupancyOnly \
--XX:CMSInitiatingOccupancyFraction=50 \
--XX:CMSMaxAbortablePrecleanTime=6000 \
--XX:+CMSParallelRemarkEnabled \
--XX:+ParallelRefProcEnabled \
--XX:MaxDirectMemorySize=20g"
-
-
-# Set the ZooKeeper connection string if using an external ZooKeeper ensemble
-# e.g. host1:2181,host2:2181/chroot
-# Leave empty if not using SolrCloud
-#ZK_HOST=""
-
-
-
-# Set the ZooKeeper client timeout (for SolrCloud mode)
-#ZK_CLIENT_TIMEOUT="15000"
-
-
-# By default the start script uses "localhost"; override the hostname here
-# for production SolrCloud environments to control the hostname exposed to cluster state
-#SOLR_HOST="192.168.1.1"
-
-# By default the start script uses UTC; override the timezone if needed
-#SOLR_TIMEZONE="UTC"
-
-# Set to true to activate the JMX RMI connector to allow remote JMX client applications
-# to monitor the JVM hosting Solr; set to "false" to disable that behavior
-# (false is recommended in production environments)
-ENABLE_REMOTE_JMX_OPTS="false"
-
-
-# The script will use SOLR_PORT+10000 for the RMI_PORT or you can set it here
-# RMI_PORT=18983
-
-
-# Anything you add to the SOLR_OPTS variable will be included in the java
-# start command line as-is, in ADDITION to other options. If you specify the
-# -a option on start script, those options will be appended as well. Examples:
-#SOLR_OPTS="$SOLR_OPTS -Dsolr.autoSoftCommit.maxTime=3000"
-#SOLR_OPTS="$SOLR_OPTS -Dsolr.autoCommit.maxTime=60000"
-#SOLR_OPTS="$SOLR_OPTS -Dsolr.clustering.enabled=true"
-
-
-
-# Location where the bin/solr script will save PID files for running instances
-# If not set, the script will create PID files in $SOLR_TIP/bin
-#SOLR_PID_DIR=
-
-
-
-# Path to a directory where Solr creates index files, the specified directory
-# must contain a solr.xml; by default, Solr will use server/solr
-#SOLR_HOME=
-
-
-
-# Solr provides a default Log4J configuration properties file in server/resources
-# however, you may want to customize the log settings and file appender location
-# so you can point the script to use a different log4j.properties file
-#LOG4J_PROPS=/var/solr/log4j.properties
-
-
-
-# Location where Solr should write logs to; should agree with the file appender
-# settings in server/resources/log4j.properties
-#SOLR_LOGS_DIR=
-
-
-
-# Sets the port Solr binds to, default is 8983
-#SOLR_PORT=8983
-
-
-
-# Uncomment to set SSL-related system properties
-# Be sure to update the paths to the correct keystore for your environment
-#SOLR_SSL_OPTS="-Djavax.net.ssl.keyStore=etc/solr-ssl.keystore.jks \
-#-Djavax.net.ssl.keyStorePassword=secret \
-#-Djavax.net.ssl.trustStore=etc/solr-ssl.keystore.jks \
-#-Djavax.net.ssl.trustStorePassword=secret"
-
-
-
-# Uncomment to set a specific SSL port (-Djetty.ssl.port=N); if not set
-# and you are using SSL, then the start script will use SOLR_PORT for the SSL port
-#SOLR_SSL_PORT=
-
-
-SOLR_PID_DIR={{pid_dir}}
-SOLR_HOME={{solr_data_dir}}
-LOG4J_PROPS={{solr_conf_dir}}/log4j.properties
-SOLR_LOGS_DIR={{log_dir}}
-SOLR_PORT={{solr_port}}
-SOLR_MODE=solrcloud
-ZK_HOST={{zookeeper_hosts_list}}{{zookeeper_chroot}}
-SOLR_HOST={{hostname}}
-
-# Comment out the following SOLR_OPTS setting to config Solr to write its index and transaction log files to local filesystem. 
-# Data (index and transaction log files) exists on HDFS will not be moved to local filesystem, 
-# after you change this config, they will not be available from local filesystem.
-SOLR_OPTS="-Dsolr.directoryFactory=HdfsDirectoryFactory \
--Dsolr.lock.type=hdfs \
--Dsolr.hdfs.confdir=/etc/hadoop/conf \
--Dsolr.hdfs.home={{fs_root}}{{solr_hdfs_home_dir}} \
--Dsolr.hdfs.security.kerberos.enabled={{sole_kerberos_enabled}} \
--Dsolr.hdfs.security.kerberos.keytabfile={{solr_keytab}} \
--Dsolr.hdfs.security.kerberos.principal={{solr_principal}} \
--Dsolr.log4j.dir={{log_dir}}"
-
-    </value>
-  </property>  
-  
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/configuration/solr-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/configuration/solr-log4j.xml b/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/configuration/solr-log4j.xml
deleted file mode 100644
index 0496b0d..0000000
--- a/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/configuration/solr-log4j.xml
+++ /dev/null
@@ -1,82 +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>
-    <description>Custom log4j.properties</description>
-    <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.
-#
-#
-#
-
-#
-# Solr Logging Configuration
-#
-
-#  Logging level
-solr.log=${solr.log4j.dir}
-log4j.rootLogger=INFO, file, CONSOLE
-
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%-4r [%t] %-5p %c %x [%X{collection} %X{shard} %X{replica} %X{core}] \u2013 %m%n
-
-#- size rotation with log cleanup.
-log4j.appender.file=org.apache.log4j.RollingFileAppender
-log4j.appender.file.MaxFileSize=4MB
-log4j.appender.file.MaxBackupIndex=9
-
-#- File to log to and log format
-log4j.appender.file.File=${solr.log}/solr.log
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; [%X{collection} %X{shard} %X{replica} %X{core}] %C; %m\n
-
-log4j.logger.org.apache.zookeeper=WARN
-log4j.logger.org.apache.hadoop=WARN
-
-# set to INFO to enable infostream log messages
-log4j.logger.org.apache.solr.update.LoggingInfoStream=OFF
-    </value>
-  </property>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/configuration/solr-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/configuration/solr-site.xml b/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/configuration/solr-site.xml
deleted file mode 100644
index e36e633..0000000
--- a/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/configuration/solr-site.xml
+++ /dev/null
@@ -1,44 +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">
-  <property>
-    <name>solr.hdfs.security.kerberos.enabled</name>
-    <value>false</value>
-    <description>Set to true to enable Kerberos authentication</description>
-  </property>
-
-  <property>
-    <name>solr.hdfs.security.kerberos.keytabfile</name>
-    <value>/etc/security/keytabs/solr.service.keytab</value>
-    <description>A keytab file contains pairs of Kerberos principals and encrypted keys which allows for password-less authentication when Solr attempts to authenticate with secure Hadoop.
-    This file will need to be present on all Solr servers at the same path provided in this parameter.
-    </description>
-  </property>
-
-  <property>
-    <name>solr.hdfs.security.kerberos.principal</name>
-    <value>solr/_HOST@EXAMPLE.COM</value>
-    <description>The Kerberos principal that Solr should use to authenticate to secure Hadoop; the format of a typical Kerberos V5 principal is: primary/instance@realm
-    </description>
-  </property>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/kerberos.json b/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/kerberos.json
deleted file mode 100644
index 8e9a5e2..0000000
--- a/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/kerberos.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "services": [
-    {
-      "name": "SOLR",
-      "identities": [
-        {
-          "name": "/spnego"
-        },
-        {
-          "name": "/smokeuser"
-        },
-        {
-          "name": "/hdfs"
-        }
-      ],
-      "configurations": [
-        {
-          "solr-site": {
-              "solr.hdfs.security.kerberos.enabled":"true"
-          }
-        }
-      ],
-      "components": [
-        {
-          "name": "SOLR",
-          "identities": [
-            {
-              "name": "solr",
-              "principal": {
-                "value": "${solr-env/solr_user}/_HOST@${realm}",
-                "type": "service",
-                "configuration": "solr-site/solr.hdfs.security.kerberos.principal",
-                "local_username": "${solr-env/solr_user}"
-              },
-              "keytab": {
-                "file": "${keytab_dir}/solr.service.keytab",
-                "owner": {
-                  "name": "${solr-env/solr_user}",
-                  "access": "r"
-                },
-                "group": {
-                  "name": "${cluster-env/user_group}",
-                  "access": ""
-                },
-                "configuration": "solr-site/solr.hdfs.security.kerberos.keytabfile"
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/metainfo.xml b/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/metainfo.xml
deleted file mode 100644
index e52e36b..0000000
--- a/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/metainfo.xml
+++ /dev/null
@@ -1,82 +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>SOLR</name>
-      <displayName>Solr</displayName>
-      <comment>Solr is the popular, blazing fast open source enterprise search platform from the Apache Lucene project
-      </comment>
-      <version>5.5.0.4.2</version>
-
-      <components>
-        <component>
-          <name>SOLR</name>
-          <displayName>Solr</displayName>
-          <category>MASTER</category>
-          <cardinality>1+</cardinality>
-          <commandScript>
-            <script>scripts/solr_server.py</script>
-            <scriptType>PYTHON</scriptType>
-	    <timeout>600</timeout>
-          </commandScript>
-          <configFiles>
-            <configFile>
-              <type>xml</type>
-              <fileName>solr-site.xml</fileName>
-              <dictionaryName>solr-site</dictionaryName>
-            </configFile>
-          </configFiles>
-        </component>
-      </components>
-      <osSpecifics>
-        <osSpecific>
-          <osFamily>any</osFamily>
-          <packages>
-            <package>
-              <name>solr_4_2_*</name>
-            </package>
-            <package>
-              <name>titan_4_2_*</name>
-            </package>
-          </packages>
-        </osSpecific>
-      </osSpecifics>
-
-      <commandScript>
-        <script>scripts/service_check.py</script>
-        <scriptType>PYTHON</scriptType>
-        <timeout>300</timeout>
-      </commandScript>
-
-      <requiredServices>		
-        <service>HDFS</service>
-      </requiredServices>
-      
-      <configuration-dependencies>
-        <config-type>solr-log4j</config-type>
-        <config-type>solr-env</config-type>
-        <config-type>solr-site</config-type>
-        <config-type>titan-hbase-solr</config-type>
-        <restartRequiredAfterChange>true</restartRequiredAfterChange>
-      </configuration-dependencies>
-    </service>
-  </services>
-</metainfo>
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/__init__.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/__init__.py b/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/__init__.py
deleted file mode 100755
index 5561e10..0000000
--- a/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/__init__.py
+++ /dev/null
@@ -1,19 +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.
-
-"""

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/params.py b/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/params.py
deleted file mode 100644
index 36c27c0..0000000
--- a/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/params.py
+++ /dev/null
@@ -1,156 +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 resource_management import *
-from resource_management.libraries.script import Script
-from resource_management.libraries.functions import conf_select
-from resource_management.libraries.resources import HdfsResource
-import status_params
-
-# server configurations
-config = Script.get_config()
-stack_name = default("/hostLevelParams/stack_name", None)
-
-zookeeper_hosts = config['clusterHostInfo']['zookeeper_hosts']
-zookeeper_hosts.sort()
-zookeeper_hosts_list=','.join(zookeeper_hosts)
-
-java64_home = config['hostLevelParams']['java_home']
-
-# New Cluster Stack Version that is defined during the RESTART of a Rolling Upgrade.
-# Version being upgraded/downgraded to
-# It cannot be used during the initial Cluser Install because the version is not yet known.
-version = default("/commandParams/version", None)
-
-# current host stack version
-current_version = default("/hostLevelParams/current_version", None)
-stack_version_unformatted = str(config['hostLevelParams']['stack_version'])
-iop_stack_version = format_hdp_stack_version(stack_version_unformatted)
-
-# Upgrade direction
-upgrade_direction = default("/commandParams/upgrade_direction", None)
-
-solr_user=config['configurations']['solr-env']['solr_user']
-user_group=config['configurations']['cluster-env']['user_group']
-hostname = config['hostname']
-solr_server_hosts = config['clusterHostInfo']['solr_hosts'] 
-solr_server_host = solr_server_hosts[0]
-
-fs_root = config['configurations']['core-site']['fs.defaultFS']
-
-solr_home = '/usr/iop/current/solr-server'
-solr_conf_dir='/usr/iop/current/solr-server/conf'
-cloud_scripts=solr_home+'/server/scripts/cloud-scripts'
-if (current_version is not None and compare_versions(format_hdp_stack_version(current_version), '4.2.0.0') >=0 ) or  compare_versions(iop_stack_version, '4.2.0.0')>= 0:
-  if upgrade_direction is not None and upgrade_direction == Direction.DOWNGRADE and version is not None and compare_versions(format_hdp_stack_version(version), '4.2.0.0') < 0:
-    solr_data_dir=default("/configurations/solr-env/solr_lib_dir", None)
-  else:
-    solr_data_dir=default("/configurations/solr-env/solr_data_dir", None)
-else: #IOP 4.1
-  if upgrade_direction is not None and upgrade_direction == Direction.UPGRADE:
-    solr_data_dir=default("/configurations/solr-env/solr_data_dir", None)
-    lib_dir=default("/configurations/solr-env/solr_data_dir", None)
-    old_lib_dir=default("/configurations/solr-env/solr_lib_dir", None)
-  else:
-    solr_data_dir=default("/configurations/solr-env/solr_lib_dir", None)
-    lib_dir=default("/configurations/solr-env/solr_lib_dir", None)
-log_dir=config['configurations']['solr-env']['solr_log_dir']
-pid_dir=config['configurations']['solr-env']['solr_pid_dir']
-solr_port=config['configurations']['solr-env']['solr_port']
-
-zookeeper_chroot=config['configurations']['solr-env']['ZOOKEEPER_CHROOT']
-
-solr_xms_minmem = config['configurations']['solr-env']['solr_xms_minmem']
-solr_xmx_maxmem = config['configurations']['solr-env']['solr_xmx_maxmem']
-
-solr_site = dict(config['configurations']['solr-site'])
-security_enabled = config['configurations']['cluster-env']['security_enabled']
-solr_principal = solr_site['solr.hdfs.security.kerberos.principal']
-
-if security_enabled:
-  solr_principal = solr_principal.replace('_HOST',hostname)
-  solr_site['solr.hdfs.security.kerberos.principal']=solr_principal
-
-#kerberos
-sole_kerberos_enabled=config['configurations']['solr-site']['solr.hdfs.security.kerberos.enabled']
-solr_keytab=config['configurations']['solr-site']['solr.hdfs.security.kerberos.keytabfile']
-
-#log4j.properties
-log4j_props = config['configurations']['solr-log4j']['content']
-
-solr_in_sh_template = config['configurations']['solr-env']['content']
-
-solr_pid_file = status_params.solr_pid_file
-
-solr_hdfs_home_dir = config['configurations']['solr-env']['solr_hdfs_home_dir']
-solr_hdfs_user_mode = 0775
-
-smokeuser = config['configurations']['cluster-env']['smokeuser']
-smokeuser_principal = config['configurations']['cluster-env']['smokeuser_principal_name']
-smoke_user_keytab = config['configurations']['cluster-env']['smokeuser_keytab']
-
-hadoop_conf_dir = conf_select.get_hadoop_conf_dir()
-hadoop_bin_dir = conf_select.get_hadoop_dir("bin")
-hdfs_user = config['configurations']['hadoop-env']['hdfs_user']
-hdfs_site = config['configurations']['hdfs-site']
-default_fs = config['configurations']['core-site']['fs.defaultFS']
-hdfs_user_keytab = config['configurations']['hadoop-env']['hdfs_user_keytab']
-hdfs_principal_name = config['configurations']['hadoop-env']['hdfs_principal_name']
-kinit_path_local = get_kinit_path()
-
-# parameters for intgeration with Titan
-configuration_tags = config['configurationTags']
-
-# Intgerate with Titan
-# parse the value for property 'index.search.solr.configset' in titan-hbase-solr
-titan_solr_configset = 'titan'
-if ('titan-hbase-solr' in configuration_tags):
-    titan_hbase_solr_props = config['configurations']['titan-hbase-solr']['content']
-    prop_list = titan_hbase_solr_props.split('\n')
-    for prop in prop_list:
-      if (prop.find('index.search.solr.configset') > -1):
-         titan_solr_configset_prop = prop.split('=')
-         titan_solr_configset = titan_solr_configset_prop[1]
-
-titan_solr_conf_dir = format('/usr/iop/current/titan-client/conf/solr')
-solr_conf_trg_dir = format('/usr/iop/current/solr-server/server/solr/configsets')
-solr_solr_conf_dir = format('/usr/iop/current/solr-server/server/solr/configsets/solr')
-solr_titan_conf_dir = format('/usr/iop/current/solr-server/server/solr/configsets/{titan_solr_configset}')
-titan_solr_jar_file = format('/usr/iop/current/titan-client/lib/jts-1.13.jar')
-solr_jar_trg_file =  format('/usr/iop/current/solr-server/server/solr-webapp/webapp/WEB-INF/lib/jts-1.13.jar')
-solr_conf_trg_file = format('/usr/iop/current/solr-server/server/solr/configsets/{titan_solr_configset}/solrconfig.xml')
-
-import functools
-#create partial functions with common arguments for every HdfsDirectory call
-#to create hdfs directory we need to call params.HdfsDirectory in code
-HdfsResource = functools.partial(
-  HdfsResource,
-  user=hdfs_user,
-  security_enabled = security_enabled,
-  keytab = hdfs_user_keytab,
-  kinit_path_local = kinit_path_local,
-  hadoop_bin_dir = hadoop_bin_dir,
-  hadoop_conf_dir = hadoop_conf_dir,
-  principal_name = hdfs_principal_name,
-  hdfs_site = hdfs_site,
-  default_fs = default_fs
-)
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/service_check.py
deleted file mode 100755
index 9f6edfb..0000000
--- a/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/service_check.py
+++ /dev/null
@@ -1,91 +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.
-
-"""
-
-
-from resource_management import *
-from resource_management.libraries.functions.validate import call_and_match_output
-import subprocess
-import time
-
-class SolrServiceCheck(Script):
-  def service_check(self, env):
-    import params
-    env.set_params(params)
-
-    command = "curl"
-    httpGssnegotiate = "--negotiate"
-    userpswd = "-u:"
-    insecure = "-k"
-    silent = "-s"
-    out = "-o /dev/null"
-    head = "-w'%{http_code}'"
-    url = "http://" + params.solr_server_host + ":" + str(params.solr_port) + "/solr/"
-    url_server_check = url + '#/'
-
-    command_with_flags = [command, silent, out, head, httpGssnegotiate, userpswd, insecure, url_server_check]
-
-    is_running = False
-    for i in range(1,11):
-      proc = subprocess.Popen(command_with_flags, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-      Logger.info("Try %d, command: %s" % (i, " ".join(command_with_flags)))
-      (stdout, stderr) = proc.communicate()
-      response = stdout
-      if '200' in response:
-        is_running = True
-        Logger.info('Solr Server up and running')
-        break
-      Logger.info("Response: %s" % str(response))
-      time.sleep(5)
-
-    if is_running == False :
-      Logger.info('Solr Server not running.')
-      raise ComponentIsNotRunning()
-
-    if params.security_enabled:
-        kinit_cmd = format("{kinit_path_local} -kt {smoke_user_keytab} {smokeuser_principal};")
-        Execute(kinit_cmd,
-                user = params.smokeuser,
-                logoutput = True
-        )
-
-    create_collection_cmd = format("SOLR_INCLUDE={solr_conf_dir}/solr.in.sh solr create -c smokeuser_ExampleCollection -s 2 -d data_driven_schema_configs")
-    create_collection_output = "success"
-    create_collection_exists_output = "Collection 'smokeuser_ExampleCollection' already exists!"
-
-    Logger.info("Creating solr collection from example: %s" % create_collection_cmd)
-    call_and_match_output(create_collection_cmd, format("({create_collection_output})|({create_collection_exists_output})"), "Failed to create collection")
-
-    list_collection_cmd = "curl " + url + "admin/collections?action=list"
-    list_collection_output = "<str>smokeuser_ExampleCollection</str>"
-    Logger.info("List Collections: %s" % list_collection_cmd)
-    call_and_match_output(list_collection_cmd, format("({list_collection_output})"), "Failed to create collection \"smokeuser_ExampleCollection\" or check that collection exists")
-
-    delete_collection_cmd = format("SOLR_INCLUDE={solr_conf_dir}/solr.in.sh solr delete -c smokeuser_ExampleCollection")
-
-    Logger.info("Deleting solr collection : %s" % delete_collection_cmd)
-
-    Execute(delete_collection_cmd,
-      user = params.solr_user,
-      logoutput=True
-    )
-
-
-if __name__ == "__main__":
-  SolrServiceCheck().execute()

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/solr.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/solr.py b/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/solr.py
deleted file mode 100644
index 175f92d..0000000
--- a/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/solr.py
+++ /dev/null
@@ -1,95 +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.
-
-"""
-
-from resource_management import *
-import sys
-import os
-
-def solr(type = None, upgrade_type=None):
-  import params
-
-  if type == 'server':
-    effective_version = params.iop_stack_version if upgrade_type is None else format_hdp_stack_version(params.version)
-
-    params.HdfsResource(params.solr_hdfs_home_dir,
-                         type="directory",
-                         action="create_on_execute",
-                         owner=params.solr_user,
-                         mode=params.solr_hdfs_user_mode
-    )
-    params.HdfsResource(None, action="execute")
-
-    Directory([params.log_dir,params.pid_dir,params.solr_conf_dir,params.solr_data_dir],
-              mode=0755,
-              cd_access='a',
-              owner=params.solr_user,
-              recursive=True,
-              group=params.user_group
-      )
-
-    XmlConfig("solr-site.xml",
-              conf_dir=params.solr_conf_dir,
-              configurations=params.solr_site,
-              configuration_attributes=params.config['configuration_attributes']['solr-site'],
-              owner=params.solr_user,
-              group=params.user_group,
-              mode=0644
-    )
-
-    File(format("{solr_conf_dir}/solr.in.sh"),
-         content=InlineTemplate(params.solr_in_sh_template),
-         owner=params.solr_user,
-         group=params.user_group
-    )
-
-    File(format("{solr_conf_dir}/log4j.properties"),
-           mode=0644,
-           group=params.user_group,
-           owner=params.solr_user,
-           content=params.log4j_props
-    )
-
-    if effective_version is not None and effective_version != "" and compare_versions(effective_version, '4.2.0.0') >= 0:
-      File(format("{solr_data_dir}/solr.xml"),
-           mode=0644,
-           group=params.user_group,
-           owner=params.solr_user,
-           content=Template("solr.xml.j2")
-      )
-    else:
-      Directory(format("{solr_data_dir}/data"),
-           owner=params.solr_user,
-           recursive=True,
-           group=params.user_group
-      )
-
-      File(format("{solr_data_dir}/data/solr.xml"),
-           mode=0644,
-           group=params.user_group,
-           owner=params.solr_user,
-           content=Template("solr.xml.j2")
-      )
-
-    #solr-webapp is temp dir, need to own by solr in order for it to wirte temp files into.
-    Directory(format("{solr_home}"),
-              owner=params.solr_user,
-              recursive=True,
-    )
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/solr_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/solr_client.py b/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/solr_client.py
deleted file mode 100755
index 27c8235..0000000
--- a/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/solr_client.py
+++ /dev/null
@@ -1,36 +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 sys
-from resource_management import *
-
-class SolrClient(Script):
-  def install(self, env):
-    self.install_packages(env)
-    
-
-  def configure(self, env):
-    print 'Configure the solr client';
-
-  def status(self, env):
-    raise ClientComponentHasNoStatus()
-
-if __name__ == "__main__":
-  SolrClient().execute()

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/solr_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/solr_server.py b/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/solr_server.py
deleted file mode 100644
index 984ace8..0000000
--- a/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/solr_server.py
+++ /dev/null
@@ -1,107 +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 sys
-from resource_management import *
-from resource_management.libraries.functions import conf_select
-from resource_management.libraries.functions import iop_select
-from solr_service import solr_service
-from solr import solr
-
-class SolrServer(Script):
-  def install(self, env):
-    self.install_packages(env)
-
-  def configure(self, env, upgrade_type=None):
-    import params
-    env.set_params(params)
-    solr(type='server', upgrade_type=upgrade_type)
-
-  def pre_upgrade_restart(self, env, upgrade_type=None):
-    Logger.info("Executing Stack Upgrade pre-restart")
-    import params
-    env.set_params(params)
-    if params.version and compare_versions(format_hdp_stack_version(params.version), '4.1.0.0') >= 0:
-      iop_select.select("solr-server", params.version)
-      conf_select.select(params.stack_name, "solr", params.version)
-
-  def start(self, env, upgrade_type=None):
-    import params
-    env.set_params(params)
-    self.configure(env)
-    solr_service(action = 'start')
-
-  def stop(self, env, upgrade_type=None):
-    import params
-    env.set_params(params)
-    solr_service(action = 'stop')
-
-  def status(self, env):
-    import status_params
-    env.set_params(status_params)
-    check_process_status(status_params.solr_pid_file)
-
-  def security_status(self, env):
-    import status_params
-    env.set_params(status_params)
-    if status_params.security_enabled:
-      props_value_check = {"solr.hdfs.security.kerberos.enabled":"true"}
-      props_empty_check = ["solr.hdfs.security.kerberos.keytabfile",
-                           "solr.hdfs.security.kerberos.principal"]
-      props_read_check = ["solr.hdfs.security.kerberos.keytabfile"]
-      solr_site_props = build_expectations('solr-site', props_value_check, props_empty_check, props_read_check)
-
-      solr_expectations = {}
-      solr_expectations.update(solr_site_props)
-
-      security_params = get_params_from_filesystem(status_params.solr_conf_dir,
-                                                   {'solr-site.xml': FILE_TYPE_XML})
-      result_issues = validate_security_config_properties(security_params,solr_expectations)
-
-      if not result_issues: # If all validations passed successfully
-        try:
-          if 'solr-site' not in security_params \
-            or 'solr.hdfs.security.kerberos.keytabfile' not in security_params['solr-site'] \
-            or 'solr.hdfs.security.kerberos.principal' not in security_params['solr-site']:
-            self.put_structured_out({"securityState": "UNSECURED"})
-            self.put_structured_out({"securityIssuesFound": "Keytab file or principal are not set property."})
-            return
-          cached_kinit_executor(status_params.kinit_path_local,
-                                status_params.solr_user,
-                                security_params['solr-site']['solr.hdfs.security.kerberos.keytabfile'],
-                                security_params['solr-site']['solr.hdfs.security.kerberos.principal'],
-                                status_params.hostname,
-                                status_params.tmp_dir)
-          self.put_structured_out({"securityState": "SECURED_KERBEROS"})
-        except Exception as e:
-          self.put_structured_out({"securityState": "ERROR"})
-          self.put_structured_out({"securityStateErrorInfo": str(e)})
-      else:
-        issues = []
-        for cf in result_issues:
-          issues.append("Configuration file %s did not pass the validation. Reason: %s" % (cf, result_issues[cf]))
-        self.put_structured_out({"securityIssuesFound": ". ".join(issues)})
-        self.put_structured_out({"securityState": "UNSECURED"})
-    else:
-      self.put_structured_out({"securityState": "UNSECURED"})
-
-
-if __name__ == "__main__":
-  SolrServer().execute()

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/solr_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/solr_service.py b/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/solr_service.py
deleted file mode 100644
index 65c1473..0000000
--- a/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/solr_service.py
+++ /dev/null
@@ -1,71 +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
-
-"""
-import os
-from resource_management import *
-from resource_management.libraries.functions.validate import call_and_match_output
-
-def solr_service(action='start'):
-  import params
-  cmd = format("{solr_home}/bin/solr")
-
-  if action == 'start':
-
-    if params.security_enabled:
-      if params.solr_principal is None:
-        solr_principal_with_host = 'missing_principal'
-      else:
-        solr_principal_with_host = params.solr_principal.replace("_HOST", params.hostname)
-      kinit_cmd = format("{kinit_path_local} -kt {solr_keytab} {solr_principal_with_host};")
-      Execute(kinit_cmd,user=params.solr_user)
-
-    Execute ('echo "Creating znode" ' + params.zookeeper_chroot)
-    Execute (params.cloud_scripts + '/zkcli.sh -zkhost ' + params.zookeeper_hosts_list + ' -cmd makepath ' + params.zookeeper_chroot, user=params.solr_user, ignore_failures=True )
-
-    # copy titan directory and jar for titan and solr integration
-    if (('titan-env' in params.configuration_tags) and not (os.path.exists(params.solr_conf_trg_file))):
-            Execute(("cp", "-r", params.titan_solr_conf_dir, params.solr_conf_trg_dir), sudo = True)
-            Execute(("cp", params.titan_solr_jar_file, params.solr_jar_trg_file), sudo = True)
-            Execute(("chmod", "644", params.solr_jar_trg_file), sudo=True)
-            Execute(("mv", params.solr_solr_conf_dir, params.solr_titan_conf_dir), sudo = True)
-
-    daemon_cmd = format("SOLR_INCLUDE={solr_conf_dir}/solr.in.sh {cmd} start -c -V")
-    no_op_test = format("ls {solr_pid_file} >/dev/null 2>&1 && ps `cat {solr_pid_file}` >/dev/null 2>&1")
-    Execute(daemon_cmd,
-            not_if=no_op_test,
-            user=params.solr_user
-    )
-
-    # create collection for titan and solr integration
-    if (('titan-env' in params.configuration_tags) and (os.path.exists(params.solr_conf_trg_file))):
-        create_collection_cmd = format("SOLR_INCLUDE={solr_conf_dir}/solr.in.sh solr create -c {titan_solr_configset} -s 2 -d {titan_solr_configset}")
-        create_collection_output = "success"
-        create_collection_exists_output = format("Collection '{titan_solr_configset}' already exists!")
-        call_and_match_output(create_collection_cmd, format("({create_collection_output})|({create_collection_exists_output})"), "Failed to create collection")
-
-  elif action == 'stop':
-    daemon_cmd = format("export SOLR_PID_DIR=" + params.pid_dir + "; SOLR_INCLUDE={solr_conf_dir}/solr.in.sh {cmd} stop -all")
-    no_op_test = format("! ((`SOLR_INCLUDE={solr_conf_dir}/solr.in.sh {cmd} status |grep process |wc -l`))")
-    rm_pid = format("rm -f {solr_pid_file}")
-    Execute(daemon_cmd,
-            not_if=no_op_test,
-            user=params.solr_user
-    )
-    Execute(rm_pid)

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/solr_upgrade.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/solr_upgrade.py b/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/solr_upgrade.py
deleted file mode 100644
index f3eab39..0000000
--- a/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/solr_upgrade.py
+++ /dev/null
@@ -1,135 +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.
-
-"""
-import os
-from resource_management import *
-from resource_management.core.logger import Logger
-from resource_management.core.resources.system import Execute
-from resource_management.libraries.functions import conf_select
-from resource_management.libraries.functions import get_unique_id_and_date
-
-class SolrServerUpgrade(Script):
-  def pre_upgrade_conf41(self, env):
-    """
-    Create /etc/solr/4.1.0.0/0 directory and copies Solr config files here.
-    Create symlinks accordingly.
-
-    conf-select create-conf-dir --package solr --stack-version 4.1.0.0 --conf-version 0
-    cp -r /usr/iop/4.1.0.0/solr/conf/* /etc/solr/4.1.0.0/0/.
-    unlink or rm -r /usr/iop/4.1.0.0/solr/conf
-    ln -s /etc/solr/4.1.0.0/0 /usr/iop/4.1.0.0/solr/conf
-    conf-select set-conf-dir --package solr --stack-version 4.1.0.0 --conf-version 0
-    """
-    import params
-    env.set_params(params)
-
-    solr41_conf_dir="/usr/iop/4.1.0.0/solr/conf"
-    solr41_etc_dir="/etc/solr/4.1.0.0/0"
-    if not os.path.exists(solr41_etc_dir):
-      conf_select.create(params.stack_name, "solr", "4.1.0.0")
-
-    content_path=solr41_conf_dir
-    if not os.path.isfile("/usr/iop/4.1.0.0/solr/conf/solr.in.sh"):
-      content_path = "/etc/solr/conf.backup"
-
-    for each in os.listdir(content_path):
-      File(os.path.join(solr41_etc_dir, each),
-           owner=params.solr_user,
-           content = StaticFile(os.path.join(content_path, each)))
-
-    if not os.path.islink(solr41_conf_dir):
-      Directory(solr41_conf_dir,
-                action="delete",
-                recursive=True)
-
-    if os.path.islink(solr41_conf_dir):
-      os.unlink(solr41_conf_dir)
-
-    if not os.path.islink(solr41_conf_dir):
-      Link(solr41_conf_dir,
-           to=solr41_etc_dir
-      )
-
-    conf_select.select(params.stack_name, "solr", "4.1.0.0")
-
-  def pre_stop_backup_cores(self, env):
-    """
-    Backs up the Solr cores under Solr's home directory.
-    cp -r /var/lib/solr/data/* /tmp/solr/cores
-    """
-    import params
-    env.set_params(params)
-
-    if compare_versions(format_hdp_stack_version(params.current_version), '4.2.0.0') >= 0:
-      solr_home_dir=params.solr_data_dir
-    else: #4.1.0.0
-      solr_home_dir=params.old_lib_dir + "/data"
-
-    unique = get_unique_id_and_date()
-    backup_solr_dir="/tmp/upgrades/{0}/solr_{1}".format(params.current_version, unique)
-    backup_solr_cores="/tmp/solr/cores"
-
-    if os.path.isdir(solr_home_dir) and not os.path.isdir(backup_solr_dir):
-      os.makedirs(backup_solr_dir)
-      Execute(('cp', '-r', solr_home_dir+"/.", backup_solr_dir),
-              sudo=True
-      )
-
-    if params.upgrade_direction is not None and params.upgrade_direction == Direction.UPGRADE:
-      Directory(backup_solr_cores,
-                action="delete",
-                recursive=True)
-
-      Directory(backup_solr_cores,
-                mode=0755,
-                cd_access='a',
-                owner=params.solr_user,
-                recursive=True,
-                group=params.user_group
-      )
-
-      Execute(('cp', '-r', solr_home_dir+"/.", backup_solr_cores),
-              user=params.solr_user
-      )
-
-  def pre_start_migrate_cores(self, env):
-    """
-    Copy the Solr cores from previous version to the new Solr home directory if solr_home is a differnet directory.
-    cp -r /tmp/solr/cores/* /opt/solr/data/.
-    """
-    import params
-    env.set_params(params)
-
-    if params.upgrade_direction is not None and params.upgrade_direction == Direction.UPGRADE:
-      backup_solr_cores="/tmp/solr/cores"
-      solr_home_dir=params.solr_data_dir
-
-      Directory(format(solr_home_dir),
-                owner=params.solr_user,
-                recursive=True,
-                group=params.user_group
-      )
-
-      if os.path.isdir(solr_home_dir) and os.path.isdir(backup_solr_cores):
-        Execute(('cp', '-rn', backup_solr_cores+"/.", solr_home_dir),
-                 user=params.solr_user,
-                 logoutput=True
-        )
-
-if __name__ == "__main__":
-  SolrServerUpgrade().execute()

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/status_params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/status_params.py
deleted file mode 100644
index 5bd0000..0000000
--- a/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/scripts/status_params.py
+++ /dev/null
@@ -1,32 +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.
-
-"""
-
-from resource_management import *
-import status_params
-
-config = Script.get_config()
-
-solr_user = config['configurations']['solr-env']['solr_user']
-hostname = config['hostname']
-kinit_path_local = functions.get_kinit_path()
-tmp_dir = Script.get_tmp_dir()
-solr_pid_dir = config['configurations']['solr-env']['solr_pid_dir']
-solr_port = config['configurations']['solr-env']['solr_port']
-solr_pid_file = format("{solr_pid_dir}/solr-{solr_port}.pid")

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/templates/solr.xml.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/templates/solr.xml.j2 b/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/templates/solr.xml.j2
deleted file mode 100644
index e247452..0000000
--- a/ambari-server/src/main/resources/common-services/SOLR/5.5.0.4.2/package/templates/solr.xml.j2
+++ /dev/null
@@ -1,51 +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.
--->
-
-<!--
-   This is an example of a simple "solr.xml" file for configuring one or 
-   more Solr Cores, as well as allowing Cores to be added, removed, and 
-   reloaded via HTTP requests.
-
-   More information about options available in this configuration file, 
-   and Solr Core administration can be found online:
-   http://wiki.apache.org/solr/CoreAdmin
--->
-
-<solr>
-
-  <solrcloud>
-
-    <str name="host">${host:}</str>
-    <int name="hostPort">${jetty.port:8983}</int>
-    <str name="hostContext">${hostContext:solr}</str>
-
-    <bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
-
-    <int name="zkClientTimeout">${zkClientTimeout:30000}</int>
-    <int name="distribUpdateSoTimeout">${distribUpdateSoTimeout:600000}</int>
-    <int name="distribUpdateConnTimeout">${distribUpdateConnTimeout:60000}</int>
-
-  </solrcloud>
-
-  <shardHandlerFactory name="shardHandlerFactory"
-    class="HttpShardHandlerFactory">
-    <int name="socketTimeout">${socketTimeout:600000}</int>
-    <int name="connTimeout">${connTimeout:60000}</int>
-  </shardHandlerFactory>
-
-</solr>

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.0/blueprints/multinode-default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/blueprints/multinode-default.json b/ambari-server/src/main/resources/stacks/BigInsights/4.0/blueprints/multinode-default.json
deleted file mode 100644
index cc1e217..0000000
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/blueprints/multinode-default.json
+++ /dev/null
@@ -1,182 +0,0 @@
-{
-    "configurations" : [
-        {
-            "nagios-env" : {
-                "nagios_contact" : "admin@localhost"
-            }
-        }
-    ],
-    "host_groups" : [
-        {
-            "name" : "master_1",
-            "components" : [
-                {
-                    "name" : "NAMENODE"
-                },
-                {
-                    "name" : "ZOOKEEPER_SERVER"
-                },
-                {
-                    "name" : "HBASE_MASTER"
-                },
-                {
-                    "name" : "GANGLIA_SERVER"
-                },
-                {
-                    "name" : "HDFS_CLIENT"
-                },
-                {
-                    "name" : "YARN_CLIENT"
-                },
-                {
-                    "name" : "HCAT"
-                },
-                {
-                    "name" : "GANGLIA_MONITOR"
-                }
-            ],
-            "cardinality" : "1"
-        },
-        {
-            "name" : "master_2",
-            "components" : [
-
-                {
-                    "name" : "ZOOKEEPER_CLIENT"
-                },
-                {
-                    "name" : "HISTORYSERVER"
-                },
-                {
-                    "name" : "HIVE_SERVER"
-                },
-                {
-                    "name" : "SECONDARY_NAMENODE"
-                },
-                {
-                    "name" : "HIVE_METASTORE"
-                },
-                {
-                    "name" : "HDFS_CLIENT"
-                },
-                {
-                    "name" : "HIVE_CLIENT"
-                },
-                {
-                    "name" : "YARN_CLIENT"
-                },
-                {
-                    "name" : "MYSQL_SERVER"
-                },
-                {
-                    "name" : "POSTGRESQL_SERVER"
-                },
-                {
-                    "name" : "GANGLIA_MONITOR"
-                },
-                {
-                    "name" : "WEBHCAT_SERVER"
-                }
-            ],
-            "cardinality" : "1"
-        },
-        {
-            "name" : "master_3",
-            "components" : [
-                {
-                    "name" : "RESOURCEMANAGER"
-                },
-                {
-                    "name" : "ZOOKEEPER_SERVER"
-                },
-                {
-                    "name" : "GANGLIA_MONITOR"
-                }
-            ],
-            "cardinality" : "1"
-        },
-        {
-            "name" : "master_4",
-            "components" : [
-                {
-                    "name" : "OOZIE_SERVER"
-                },
-                {
-                    "name" : "ZOOKEEPER_SERVER"
-                },
-                {
-                    "name" : "GANGLIA_MONITOR"
-                }
-            ],
-            "cardinality" : "1"
-        },
-        {
-            "name" : "slave",
-            "components" : [
-                {
-                    "name" : "HBASE_REGIONSERVER"
-                },
-                {
-                    "name" : "NODEMANAGER"
-                },
-                {
-                    "name" : "DATANODE"
-                },
-                {
-                    "name" : "GANGLIA_MONITOR"
-                }
-            ],
-            "cardinality" : "${slavesCount}"
-        },
-        {
-            "name" : "gateway",
-            "components" : [
-                {
-                    "name" : "AMBARI_SERVER"
-                },
-                {
-                    "name" : "NAGIOS_SERVER"
-                },
-                {
-                    "name" : "ZOOKEEPER_CLIENT"
-                },
-                {
-                    "name" : "PIG"
-                },
-                {
-                    "name" : "OOZIE_CLIENT"
-                },
-                {
-                    "name" : "HBASE_CLIENT"
-                },
-                {
-                    "name" : "HCAT"
-                },
-                {
-                    "name" : "SQOOP"
-                },
-                {
-                    "name" : "HDFS_CLIENT"
-                },
-                {
-                    "name" : "HIVE_CLIENT"
-                },
-                {
-                    "name" : "YARN_CLIENT"
-                },
-                {
-                    "name" : "MAPREDUCE2_CLIENT"
-                },
-                {
-                    "name" : "GANGLIA_MONITOR"
-                }
-            ],
-            "cardinality" : "1"
-        }
-    ],
-    "Blueprints" : {
-        "blueprint_name" : "blueprint-multinode-default",
-        "stack_name" : "BigInsights",
-        "stack_version" : "4.0"
-    }
-}

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.0/blueprints/singlenode-default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/blueprints/singlenode-default.json b/ambari-server/src/main/resources/stacks/BigInsights/4.0/blueprints/singlenode-default.json
deleted file mode 100644
index 6a51adc..0000000
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/blueprints/singlenode-default.json
+++ /dev/null
@@ -1,133 +0,0 @@
-{
-    "configurations" : [
-        {
-            "nagios-env" : {
-                "nagios_contact" : "admin@localhost"
-            }
-        }
-    ],
-    "host_groups" : [
-        {
-            "name" : "host_group_1",
-            "components" : [
-                {
-                    "name" : "STORM_REST_API"
-                },
-                {
-                    "name" : "PIG"
-                },
-                {
-                    "name" : "HISTORYSERVER"
-                },
-                {
-                    "name" : "HBASE_REGIONSERVER"
-                },
-                {
-                    "name" : "OOZIE_CLIENT"
-                },
-                {
-                    "name" : "HBASE_CLIENT"
-                },
-                {
-                    "name" : "NAMENODE"
-                },
-                {
-                    "name" : "SUPERVISOR"
-                },
-                {
-                    "name" : "FALCON_SERVER"
-                },
-                {
-                    "name" : "HCAT"
-                },
-                {
-                    "name" : "AMBARI_SERVER"
-                },
-                {
-                    "name" : "APP_TIMELINE_SERVER"
-                },
-                {
-                    "name" : "HDFS_CLIENT"
-                },
-                {
-                    "name" : "HIVE_CLIENT"
-                },
-                {
-                    "name" : "NODEMANAGER"
-                },
-                {
-                    "name" : "DATANODE"
-                },
-                {
-                    "name" : "WEBHCAT_SERVER"
-                },
-                {
-                    "name" : "RESOURCEMANAGER"
-                },
-                {
-                    "name" : "ZOOKEEPER_SERVER"
-                },
-                {
-                    "name" : "ZOOKEEPER_CLIENT"
-                },
-                {
-                    "name" : "STORM_UI_SERVER"
-                },
-                {
-                    "name" : "HBASE_MASTER"
-                },
-                {
-                    "name" : "HIVE_SERVER"
-                },
-                {
-                    "name" : "OOZIE_SERVER"
-                },
-                {
-                    "name" : "FALCON_CLIENT"
-                },
-                {
-                    "name" : "NAGIOS_SERVER"
-                },
-                {
-                    "name" : "SECONDARY_NAMENODE"
-                },
-                {
-                    "name" : "HIVE_METASTORE"
-                },
-                {
-                    "name" : "GANGLIA_SERVER"
-                },
-                {
-                    "name" : "SQOOP"
-                },
-                {
-                    "name" : "YARN_CLIENT"
-                },
-                {
-                    "name" : "MAPREDUCE2_CLIENT"
-                },
-                {
-                    "name" : "MYSQL_SERVER"
-                },
-                {
-                    "name" : "POSTGRESQL_SERVER"
-                },
-                {
-                    "name" : "GANGLIA_MONITOR"
-                },
-                {
-                    "name" : "DRPC_SERVER"
-                },
-                {
-                    "name" : "NIMBUS"
-                }
-            ],
-            "cardinality" : "1"
-        }
-    ],
-    "Blueprints" : {
-        "blueprint_name" : "blueprint-singlenode-default",
-        "stack_name" : "BigInsights",
-        "stack_version" : "4.0"
-    }
-}


Mime
View raw message