Explorar o código

AMBARI-8686. Ability to create Hive MetaStore and Hive Server 2 on separate hosts. (alexantonenko)

Alex Antonenko %!s(int64=10) %!d(string=hai) anos
pai
achega
bbd7a13e9e

+ 0 - 10
ambari-web/app/controllers/wizard/step5_controller.js

@@ -659,16 +659,6 @@ App.WizardStep5Controller = Em.Controller.extend(App.BlueprintMixin, {
     console.log('Load recommendations failed');
   },
 
-  /**
-   * @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

+ 0 - 1
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'
 };

+ 0 - 6
ambari-web/app/templates/wizard/step5.hbs

@@ -61,12 +61,6 @@
                       <div class="hostName">
                         {{selectedHost}}<i class="icon-asterisks">&#10037;</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}}

+ 2 - 2
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
     }