You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/05/16 22:45:50 UTC
[1/2] ambari git commit: AMBARI-11191. Ambari yarn proxy user configs
are not correct. (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk fcbde3243 -> 88294bb09
AMBARI-11191. Ambari yarn proxy user configs are not correct. (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/88294bb0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/88294bb0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/88294bb0
Branch: refs/heads/trunk
Commit: 88294bb09fbb047cdfee7a256d241805cc2bd7e3
Parents: e205bd1
Author: Alex Antonenko <hi...@gmail.com>
Authored: Sat May 16 23:44:01 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Sat May 16 23:45:43 2015 +0300
----------------------------------------------------------------------
.../resources/common-services/YARN/2.1.0.2.0/kerberos.json | 8 +++++++-
.../resources/stacks/HDP/2.2/services/YARN/kerberos.json | 8 +++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/88294bb0/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/kerberos.json b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/kerberos.json
index e3a2d58..1332ae9 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/kerberos.json
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/kerberos.json
@@ -36,6 +36,12 @@
"yarn.resourcemanager.proxy-user-privileges.enabled": "true",
"yarn.nodemanager.linux-container-executor.cgroups.mount-path": ""
}
+ },
+ {
+ "core-site": {
+ "hadoop.proxyuser.yarn.groups": "*",
+ "hadoop.proxyuser.yarn.hosts": "${yarn-site/yarn.resourcemanager.hostname}"
+ }
}
],
"components": [
@@ -205,4 +211,4 @@
]
}
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/88294bb0/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/kerberos.json b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/kerberos.json
index d4b005a..ff8dc2c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/kerberos.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/kerberos.json
@@ -36,6 +36,12 @@
"yarn.resourcemanager.proxy-user-privileges.enabled": "true",
"yarn.nodemanager.linux-container-executor.cgroups.mount-path": ""
}
+ },
+ {
+ "core-site": {
+ "hadoop.proxyuser.yarn.groups": "*",
+ "hadoop.proxyuser.yarn.hosts": "${yarn-site/yarn.resourcemanager.hostname}"
+ }
}
],
"components": [
@@ -205,4 +211,4 @@
]
}
]
-}
\ No newline at end of file
+}
[2/2] ambari git commit: AMBARI-11190. Admin View: edit on cluster
config'd view prompts for masked props on edit (alexantonenko)
Posted by al...@apache.org.
AMBARI-11190. Admin View: edit on cluster config'd view prompts for masked props on edit (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e205bd15
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e205bd15
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e205bd15
Branch: refs/heads/trunk
Commit: e205bd15d6c50bbcab00062a6d7157b51bff2b32
Parents: fcbde32
Author: Alex Antonenko <hi...@gmail.com>
Authored: Sat May 16 17:41:41 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Sat May 16 23:45:43 2015 +0300
----------------------------------------------------------------------
.../controllers/ambariViews/ViewsEditCtrl.js | 29 ++++++++++++++------
.../admin-web/app/views/ambariViews/edit.html | 10 +++++--
2 files changed, 29 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e205bd15/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js
index d75d8b2..1362921 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js
@@ -88,6 +88,17 @@ angular.module('ambariAdminConsole')
}
}
+ function filterClusterConfigs() {
+ $scope.configurationMeta.forEach(function (element) {
+ if (element.masked && !$scope.editConfigurationDisabled && element.clusterConfig && !$scope.isLocalCluster) {
+ $scope.configuration[element.name] = '';
+ }
+ if(!element.clusterConfig) {
+ delete $scope.configurationBeforeEdit[element.name];
+ }
+ });
+ }
+
// Get META for properties
View.getMeta($routeParams.viewId, $routeParams.version).then(function(data) {
$scope.configurationMeta = data.data.ViewVersionInfo.parameters;
@@ -137,6 +148,15 @@ angular.module('ambariAdminConsole')
$scope.numberOfClusterConfigs = 0;
$scope.numberOfSettingsConfigs = 0;
+ $scope.enableLocalCluster = function() {
+ angular.extend($scope.configuration, $scope.configurationBeforeEdit);
+ $scope.propertiesForm.$setPristine();
+ };
+
+ $scope.disableLocalCluster = function() {
+ filterClusterConfigs();
+ };
+
$scope.toggleSettingsEdit = function() {
$scope.editSettingsDisabled = !$scope.editSettingsDisabled;
$scope.settingsBeforeEdit = angular.copy($scope.configuration);
@@ -247,14 +267,7 @@ angular.module('ambariAdminConsole')
$scope.togglePropertiesEditing = function () {
$scope.editConfigurationDisabled = !$scope.editConfigurationDisabled;
$scope.configurationBeforeEdit = angular.copy($scope.configuration);
- $scope.configurationMeta.forEach(function (element) {
- if (element.masked && !$scope.editConfigurationDisabled && element.clusterConfig) {
- $scope.configuration[element.name] = '';
- }
- if(!element.clusterConfig) {
- delete $scope.configurationBeforeEdit[element.name];
- }
- });
+ filterClusterConfigs();
};
$scope.saveConfiguration = function() {
if( $scope.propertiesForm.$valid ){
http://git-wip-us.apache.org/repos/asf/ambari/blob/e205bd15/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html
index b0a7a3b..b41f639 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html
@@ -182,7 +182,7 @@
<div class="panel-body property-form" popover="{{clusterConfigurableErrorMsg}}" popover-trigger="mouseenter">
<div class="checkbox">
<label>
- <input type="radio" ng-model="$parent.isLocalCluster" ng-disabled="!clusterConfigurable || editConfigurationDisabled || noClusterAvailible" ng-value="true" class="visibilityCheckbox"> Local Ambari Managed Cluster
+ <input type="radio" ng-model="$parent.isLocalCluster" ng-change="enableLocalCluster()" ng-disabled="!clusterConfigurable || editConfigurationDisabled || noClusterAvailible" ng-value="true" class="visibilityCheckbox"> Local Ambari Managed Cluster
</label>
</div>
<div class="form-horizontal property-form">
@@ -198,7 +198,13 @@
<p> </p>
<div class="checkbox">
<label>
- <input type="radio" ng-model="$parent.isLocalCluster" ng-disabled="editConfigurationDisabled" ng-value="false" class="visibilityCheckbox"> Custom
+ <input type="radio"
+ ng-model="$parent.isLocalCluster"
+ ng-disabled="editConfigurationDisabled"
+ ng-value="false"
+ ng-change="disableLocalCluster()"
+ class="visibilityCheckbox">
+ Custom
</label>
</div>
</div>