Merging branch-feature-ambari-14714 into branch-feature-ambari-14714-ui

ambari-admin/src/main/resources/ui/admin-web/bower.json

@@ -1,26 +1,26 @@
 {
-	"name": "adminconsole",
-	"private": true,
-	"dependencies": {
-		"bootstrap": "3.1.1",
-		"angular": "1.5.11",
-		"angular-route": "1.5.11",
-		"angular-bootstrap": "0.11.0",
-		"underscore": "1.7.0",
-		"restangular": "1.4.0",
-		"angular-bootstrap-toggle-switch": "0.5.1",
-		"angular-animate": "1.5.11",
-		"angular-translate": "2.2.0",
-		"font-awesome": "4.2.0"
-	},
-	"devDependencies": {
-		"angular-mocks": "1.5.11",
-		"commonjs": "0.2.0",
-		"chai": "1.8.0",
-		"mocha": "1.14.0",
-		"sinon": "1.10.3"
-	},
-	"resolutions": {
-		"angular": "1.5.11"
-	}
+  "name": "adminconsole",
+  "private": true,
+  "dependencies": {
+    "bootstrap": "3.3.7",
+    "angular": "1.5.11",
+    "angular-route": "1.5.11",
+    "angular-bootstrap": "0.11.0",
+    "underscore": "1.7.0",
+    "restangular": "1.4.0",
+    "angular-bootstrap-toggle-switch": "0.5.1",
+    "angular-animate": "1.5.11",
+    "angular-translate": "2.2.0",
+    "font-awesome": "4.2.0"
+  },
+  "devDependencies": {
+    "angular-mocks": "1.5.11",
+    "commonjs": "0.2.0",
+    "chai": "1.8.0",
+    "mocha": "1.14.0",
+    "sinon": "1.10.3"
+  },
+  "resolutions": {
+    "angular": "1.5.11"
+  }
 }

ambari-agent/conf/unix/ambari-agent

@@ -62,7 +62,7 @@ export PATH=/usr/sbin:/sbin:/usr/lib/ambari-server/*:$PATH
 export AMBARI_CONF_DIR=$HOME_DIR/etc/ambari-server/conf:$PATH
 
 # Because Ambari rpm unpacks modules here on all systems
-export PYTHONPATH=/usr/lib/ambari-agent/lib:${PYTHONPATH:-}
+export PYTHONPATH=/usr/lib/ambari-agent/lib:/usr/lib/mpack-instance-manager:${PYTHONPATH:-}
 
 export AMBARI_PID_DIR=`get_agent_property piddir`
 export AMBARI_PID_DIR=`valid_path "${AMBARI_PID_DIR:?}"`

ambari-agent/conf/unix/install-helper.sh

@@ -117,7 +117,7 @@ do_install(){
   fi
 
   if [ -f "$AMBARI_ENV_RPMSAVE" ] ; then
-    PYTHON_PATH_LINE='export PYTHONPATH=/usr/lib/ambari-agent/lib:$PYTHONPATH'
+    PYTHON_PATH_LINE='export PYTHONPATH=/usr/lib/ambari-agent/lib:/usr/lib/mpack-instance-manager:$PYTHONPATH'
     grep "^$PYTHON_PATH_LINE\$" "$AMBARI_ENV_RPMSAVE" > /dev/null
     if [ $? -ne 0 ] ; then
       echo -e "\n$PYTHON_PATH_LINE" >> $AMBARI_ENV_RPMSAVE

ambari-common/src/main/python/ambari_commons/constants.py

@@ -21,7 +21,7 @@
 AMBARI_SUDO_BINARY = "ambari-sudo.sh"
 
 UPGRADE_TYPE_ROLLING = "rolling"
-UPGRADE_TYPE_NON_ROLLING = "nonrolling"
+UPGRADE_TYPE_EXPRESS = "express"
 UPGRADE_TYPE_HOST_ORDERED = "host_ordered"
 
 

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

@@ -21,6 +21,7 @@
 from resource_management.core.exceptions import Fail
 from resource_management.core.logger import Logger
 from resource_management.libraries.resources.repository import Repository
+from resource_management.libraries.functions.cluster_settings import get_cluster_setting_value
 from resource_management.libraries.functions.is_empty import is_empty
 import ambari_simplejson as json
 
@@ -36,8 +37,8 @@ def __init__(self, config, tags_to_skip):
 
     # repo templates
     repo_file = config['repositoryFile']
-    repo_rhel_suse =  config['configurations']['cluster-env']['repo_suse_rhel_template']
-    repo_ubuntu =  config['configurations']['cluster-env']['repo_ubuntu_template']
+    repo_rhel_suse =  get_cluster_setting_value('repo_suse_rhel_template')
+    repo_ubuntu =  get_cluster_setting_value('repo_ubuntu_template')
 
     if is_empty(repo_file):
       return

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

@@ -55,7 +55,7 @@ def get_setting_type_entries(setting_type, setting_names=None):
         return None
 
     if setting_names is None: # Return all settings
-        return settings
+        setting_names = settings.keys()
 
     if not isinstance(setting_names, (set, frozenset, tuple, list)):
         Logger.error("'setting_names' type expected to be either a : set, frozenset, tuple, or list. "
@@ -66,7 +66,7 @@ def get_setting_type_entries(setting_type, setting_names=None):
         Logger.error("Passed-in settings set is EMPTY")
         return None
     else:
-        result = dict((setting, settings[setting]) for setting in setting_names if setting in settings)
+        result = dict((setting, convert_value(settings[setting])) for setting in setting_names if setting in settings)
         if not result:
             Logger.error("Passed-in setting(s) in set not present.")
             return {}
@@ -100,7 +100,7 @@ def get_setting_value(setting_type, setting_name):
         Logger.info("Couldn't retrieve '"+setting_type+"'.")
         return None
 
-    return settings.get(setting_name)
+    return convert_value(settings.get(setting_name))
 
 
 def is_setting_type_supported(setting_type):
@@ -110,3 +110,16 @@ def is_setting_type_supported(setting_type):
     :return: True or False
     """
     return setting_type in (STACK_SETTINGS_TYPE, CLUSTER_SETTINGS_TYPE)
+
+
+def convert_value(value):
+    """
+    Converts some values for easier consumption.
+    Currently only strings corresponding to true/false are converted to actual boolean values.
+    """
+
+    if value == "true":
+        return True
+    if value == "false":
+        return False
+    return value

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

@@ -83,7 +83,7 @@ def check_stack_feature(stack_feature, stack_version):
             return False
         return True
   else:
-    raise Fail("Stack features not defined by stack")
+    Logger.warning("Stack features not defined by stack")
 
   return False
 

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

@@ -129,6 +129,9 @@ def is_package_supported(package, supported_packages = None):
   """
   if supported_packages is None:
     supported_packages = get_supported_packages()
+    if supported_packages is None:
+       Logger.warning('No stack tool available, all packages are assumed to be supported by this stack')
+       return True
 
   if package in supported_packages:
     return True
@@ -142,6 +145,9 @@ def get_supported_packages():
   :return: and array of packages support by <stack-select>
   """
   stack_selector_path = stack_tools.get_stack_tool_path(stack_tools.STACK_SELECTOR_NAME)
+  if not os.path.exists(stack_selector_path):
+    Logger.warning('This stack does not have a stack select tool')
+    return
   command = (STACK_SELECT_PREFIX, stack_selector_path, "packages")
   code, stdout = shell.call(command, sudo = True,  quiet = True)
 

ambari-common/src/main/python/resource_management/libraries/script/script.py

@@ -32,7 +32,7 @@
 from optparse import OptionParser
 import resource_management
 from ambari_commons import OSCheck, OSConst
-from ambari_commons.constants import UPGRADE_TYPE_NON_ROLLING
+from ambari_commons.constants import UPGRADE_TYPE_EXPRESS
 from ambari_commons.constants import UPGRADE_TYPE_ROLLING
 from ambari_commons.constants import UPGRADE_TYPE_HOST_ORDERED
 from ambari_commons.network import reconfigure_urllib2_opener
@@ -1130,8 +1130,8 @@ def get_upgrade_type(upgrade_type_command_param):
     upgrade_type = None
     if upgrade_type_command_param.lower() == "rolling_upgrade":
       upgrade_type = UPGRADE_TYPE_ROLLING
-    elif upgrade_type_command_param.lower() == "nonrolling_upgrade":
-      upgrade_type = UPGRADE_TYPE_NON_ROLLING
+    elif upgrade_type_command_param.lower() == "express_upgrade":
+      upgrade_type = UPGRADE_TYPE_EXPRESS
     elif upgrade_type_command_param.lower() == "host_ordered_upgrade":
       upgrade_type = UPGRADE_TYPE_HOST_ORDERED