You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2015/04/30 15:18:12 UTC
[2/2] ambari git commit: AMBARI-10863. Implement Ambari UI for
enabling/disabling Ranger KMS HA. (akovalenko)
AMBARI-10863. Implement Ambari UI for enabling/disabling Ranger KMS HA. (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4f86ebae
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4f86ebae
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4f86ebae
Branch: refs/heads/trunk
Commit: 4f86ebaef3aeed9b9b60936f5443c784f7573420
Parents: 2ac95cf
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Thu Apr 30 15:28:33 2015 +0300
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Thu Apr 30 16:14:37 2015 +0300
----------------------------------------------------------------------
.../main/resources/common-services/RANGER/0.4.0/metainfo.xml | 2 +-
ambari-web/app/controllers/main/service/item.js | 2 +-
ambari-web/app/views/main/service/item.js | 6 ++++++
3 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4f86ebae/ambari-server/src/main/resources/common-services/RANGER/0.4.0/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/metainfo.xml b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/metainfo.xml
index 3105d40..5b50c83 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/metainfo.xml
@@ -32,7 +32,7 @@
<name>RANGER_ADMIN</name>
<displayName>Ranger Admin</displayName>
<category>MASTER</category>
- <cardinality>1-3</cardinality>
+ <cardinality>1+</cardinality>
<versionAdvertised>true</versionAdvertised>
<commandScript>
<script>scripts/ranger_admin.py</script>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4f86ebae/ambari-web/app/controllers/main/service/item.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/item.js b/ambari-web/app/controllers/main/service/item.js
index 3497be2..18b53aa 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -54,7 +54,7 @@ App.MainServiceItemController = Em.Controller.extend({
var hostNames = App.Host.find().mapProperty('hostName');
this.set('allHosts', hostNames);
- ['HBASE_MASTER', 'HIVE_METASTORE', 'ZOOKEEPER_SERVER', 'FLUME_HANDLER', 'HIVE_SERVER'].forEach(function(componentName) {
+ ['HBASE_MASTER', 'HIVE_METASTORE', 'ZOOKEEPER_SERVER', 'FLUME_HANDLER', 'HIVE_SERVER', 'RANGER_KMS_SERVER'].forEach(function(componentName) {
self.loadHostsWithoutComponent(componentName);
});
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/4f86ebae/ambari-web/app/views/main/service/item.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/item.js b/ambari-web/app/views/main/service/item.js
index c543b17..25044e7 100644
--- a/ambari-web/app/views/main/service/item.js
+++ b/ambari-web/app/views/main/service/item.js
@@ -77,6 +77,12 @@ App.MainServiceItemView = Em.View.extend({
'label': '{0} {1}'.format(Em.I18n.t('add'), Em.I18n.t('dashboard.services.flume.agentLabel')),
service: 'FLUME',
component: 'FLUME_HANDLER'
+ },
+ {
+ cssClass: 'icon-plus',
+ 'label': '{0} {1}'.format(Em.I18n.t('add'), App.format.role('RANGER_KMS_SERVER')),
+ service: 'RANGER_KMS',
+ component: 'RANGER_KMS_SERVER'
}
]
},