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 2014/12/12 19:34:19 UTC
ambari git commit: AMBARI-8686. Ability to create Hive MetaStore and
Hive Server 2 on separate hosts. (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 51fafb9b8 -> bbd7a13e9
AMBARI-8686. Ability to create Hive MetaStore and Hive Server 2 on separate hosts. (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bbd7a13e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bbd7a13e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bbd7a13e
Branch: refs/heads/trunk
Commit: bbd7a13e9e4ea1e400e135d24db3a91cd0028a14
Parents: 51fafb9
Author: Alex Antonenko <hi...@gmail.com>
Authored: Fri Dec 12 19:26:14 2014 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Fri Dec 12 20:34:06 2014 +0200
----------------------------------------------------------------------
ambari-web/app/controllers/wizard/step5_controller.js | 10 ----------
ambari-web/app/models/stack_service_component.js | 1 -
ambari-web/app/templates/wizard/step5.hbs | 6 ------
ambari-web/test/models/stack_service_component_test.js | 4 ++--
4 files changed, 2 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/bbd7a13e/ambari-web/app/controllers/wizard/step5_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step5_controller.js b/ambari-web/app/controllers/wizard/step5_controller.js
index 33afa00..2e13c72 100644
--- a/ambari-web/app/controllers/wizard/step5_controller.js
+++ b/ambari-web/app/controllers/wizard/step5_controller.js
@@ -660,16 +660,6 @@ App.WizardStep5Controller = Em.Controller.extend(App.BlueprintMixin, {
},
/**
- * @param {string} componentName
- * @returns {bool}
- * @private
- * @method _isHiveCoHost
- */
- _isHiveCoHost: function (componentName) {
- return ['HIVE_METASTORE', 'WEBHCAT_SERVER'].contains(componentName) && !this.get('isReassignWizard');
- },
-
- /**
* Put master components to <code>selectedServicesMasters</code>, which will be automatically rendered in template
* @param {Ember.Enumerable} masterComponents
* @method renderComponents
http://git-wip-us.apache.org/repos/asf/ambari/blob/bbd7a13e/ambari-web/app/models/stack_service_component.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/stack_service_component.js b/ambari-web/app/models/stack_service_component.js
index 48e9cb9..d45576b 100644
--- a/ambari-web/app/models/stack_service_component.js
+++ b/ambari-web/app/models/stack_service_component.js
@@ -203,6 +203,5 @@ App.StackServiceComponent = DS.Model.extend({
App.StackServiceComponent.FIXTURES = [];
App.StackServiceComponent.coHost = {
- 'HIVE_METASTORE': 'HIVE_SERVER',
'WEBHCAT_SERVER': 'HIVE_SERVER'
};
http://git-wip-us.apache.org/repos/asf/ambari/blob/bbd7a13e/ambari-web/app/templates/wizard/step5.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step5.hbs b/ambari-web/app/templates/wizard/step5.hbs
index 3c48e18..d08496b 100644
--- a/ambari-web/app/templates/wizard/step5.hbs
+++ b/ambari-web/app/templates/wizard/step5.hbs
@@ -61,12 +61,6 @@
<div class="hostName">
{{selectedHost}}<i class="icon-asterisks">✵</i>
</div>
- {{#if showAddControl}}
- {{view App.AddControlView componentNameBinding="component_name"}}
- {{/if}}
- {{#if showRemoveControl}}
- {{view App.RemoveControlView componentNameBinding="component_name" serviceComponentIdBinding="serviceComponentId"}}
- {{/if}}
{{else}}
<div {{bindAttr class="errorMessage:error: warnMessage:warning: :control-group"}}>
{{#if view.shouldUseInputs}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/bbd7a13e/ambari-web/test/models/stack_service_component_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/models/stack_service_component_test.js b/ambari-web/test/models/stack_service_component_test.js
index 2fe2bdd..15e9a68 100644
--- a/ambari-web/test/models/stack_service_component_test.js
+++ b/ambari-web/test/models/stack_service_component_test.js
@@ -222,7 +222,7 @@ var componentPropertiesValidationTests = [
isRequiredOnAllHosts: false,
coHostedComponents: [],
isOtherComponentCoHosted: false,
- isCoHostedComponent: true
+ isCoHostedComponent: false
}
},
{
@@ -249,7 +249,7 @@ var componentPropertiesValidationTests = [
isMasterAddableInstallerWizard: false,
isHAComponentOnly: false,
isRequiredOnAllHosts: false,
- coHostedComponents: ['HIVE_METASTORE','WEBHCAT_SERVER'],
+ coHostedComponents: ['WEBHCAT_SERVER'],
isOtherComponentCoHosted: true,
isCoHostedComponent: false
}