Repository: ambari Updated Branches: refs/heads/trunk b39288aab -> 49c052e59
AMBARI-12904 AMS keytabs share same principal for HBase daemons (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/49c052e5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/49c052e5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/49c052e5 Branch: refs/heads/trunk Commit: 49c052e59343283828858d723573d7ba4c59a8d9 Parents: b39288a Author: Dmytro Sen <[email protected]> Authored: Fri Aug 28 12:28:00 2015 +0300 Committer: Dmytro Sen <[email protected]> Committed: Fri Aug 28 12:28:00 2015 +0300 ---------------------------------------------------------------------- .../resources/common-services/AMBARI_METRICS/0.1.0/kerberos.json | 4 ++-- .../src/main/resources/stacks/HDP/2.0.6/role_command_order.json | 2 +- .../src/main/resources/stacks/HDPWIN/2.1/role_command_order.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/49c052e5/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/kerberos.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/kerberos.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/kerberos.json index dac60f3..8753b1f 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/kerberos.json +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/kerberos.json @@ -14,7 +14,7 @@ { "name": "ams_hbase_master_hbase", "principal": { - "value": "amshbase/_HOST@${realm}", + "value": "amshbasemaster/_HOST@${realm}", "type": "service", "configuration": "ams-hbase-security-site/hbase.master.kerberos.principal", "local_username": "${ams-env/ambari_metrics_user}" @@ -35,7 +35,7 @@ { "name": "ams_hbase_regionserver_hbase", "principal": { - "value": "amshbase/_HOST@${realm}", + "value": "amshbasers/_HOST@${realm}", "type": "service", "configuration": "ams-hbase-security-site/hbase.regionserver.kerberos.principal", "local_username": "${ams-env/ambari_metrics_user}" http://git-wip-us.apache.org/repos/asf/ambari/blob/49c052e5/ambari-server/src/main/resources/stacks/HDP/2.0.6/role_command_order.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/role_command_order.json b/ambari-server/src/main/resources/stacks/HDP/2.0.6/role_command_order.json index 9140912..f5ecd7b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/role_command_order.json +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/role_command_order.json @@ -32,7 +32,7 @@ }, "_comment" : "Dependencies that are used when GLUSTERFS is not present in cluster", "optional_no_glusterfs": { - "METRICS_COLLECTOR-START": ["NAMENODE-START", "DATANODE-START"], + "METRICS_COLLECTOR-START": ["NAMENODE-START", "DATANODE-START", "SECONDARY_NAMENODE-START"], "AMBARI_METRICS_SERVICE_CHECK-SERVICE_CHECK": ["METRICS_COLLECTOR-START", "HDFS_SERVICE_CHECK-SERVICE_CHECK"], "SECONDARY_NAMENODE-START": ["NAMENODE-START"], "RESOURCEMANAGER-START": ["NAMENODE-START", "DATANODE-START"], http://git-wip-us.apache.org/repos/asf/ambari/blob/49c052e5/ambari-server/src/main/resources/stacks/HDPWIN/2.1/role_command_order.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/role_command_order.json b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/role_command_order.json index daa7f80..0c7dd60 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/role_command_order.json +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/role_command_order.json @@ -53,7 +53,7 @@ }, "_comment" : "Dependencies that are used when GLUSTERFS is not present in cluster", "optional_no_glusterfs": { - "METRICS_COLLECTOR-START": ["NAMENODE-START", "DATANODE-START"], + "METRICS_COLLECTOR-START": ["NAMENODE-START", "DATANODE-START", "SECONDARY_NAMENODE-START"], "AMBARI_METRICS_SERVICE_CHECK-SERVICE_CHECK": ["METRICS_COLLECTOR-START", "HDFS_SERVICE_CHECK-SERVICE_CHECK"], "SECONDARY_NAMENODE-START": ["NAMENODE-START"], "RESOURCEMANAGER-START": ["NAMENODE-START", "DATANODE-START"],
