[ambari] branch branch-feature-AMBARI-14714 updated: AMBARI-23999 Remove hardcoded logic in UI to create HDPCORE service group and create multiple service groups

[at...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

atkach pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by this push:
     new c00af74  AMBARI-23999 Remove hardcoded logic in UI to create HDPCORE service group and create multiple service groups
c00af74 is described below

commit c00af74feb54e1e23e12a1824c9e145158a68ed5
Author: Andrii Tkach <at...@apache.org>
AuthorDate: Thu May 31 17:31:29 2018 +0300

    AMBARI-23999 Remove hardcoded logic in UI to create HDPCORE service group and create multiple service groups
---
 ambari-web/app/controllers/wizard/step8_controller.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js
index 80a352c..90c3a3b 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -162,9 +162,8 @@ App.WizardStep8Controller = App.WizardStepController.extend(App.AddSecurityConfi
   }.property(),
 
   getSelectedStack: function() {
-    const selectedStack = this.get('content.selectedStack');
-    const stack = this.get('wizardController').getStack(selectedStack.name, selectedStack.version);
-    return stack;    
+    //TODO Remove when cluster don't need stack version, until use version of any mpack
+    return App.Stack.find().objectAt(0);
   },
 
   installedServices: function() {
@@ -926,7 +925,7 @@ App.WizardStep8Controller = App.WizardStepController.extend(App.AddSecurityConfi
    */
   createCluster: function () {
     if (!this.get('isInstaller')) return;
-    const selectedStack = this.getSelectedStack()
+    const selectedStack = this.getSelectedStack();
     this.addRequestToAjaxQueue({
       name: 'wizard.step8.create_cluster',
       data: {
@@ -972,6 +971,7 @@ App.WizardStep8Controller = App.WizardStepController.extend(App.AddSecurityConfi
       const serviceGroups = mpacks.map(mpack => ({
           "ServiceGroupInfo": {
             "service_group_name": mpack.name,
+            "version": mpack.id
           }
         })
       );

-- 
To stop receiving notification emails like this one, please contact
atkach@apache.org.