AMBARI-9977. Could not enable RM HA (RM start is failed) after Ambari only upgrade from 1.6.0 to 2.0.0 and enabling NN HA (alexantonenko)

ambari-web/app/controllers/main/admin/highAvailability/resourceManager/step3_controller.js

@@ -118,7 +118,7 @@ App.RMHighAvailabilityWizardStep3Controller = Em.Controller.extend({
       currentRMHost = this.get('content.rmHosts.currentRM'),
       additionalRMHost = this.get('content.rmHosts.additionalRM'),
       zooKeeperHostsWithPort = App.HostComponent.find().filterProperty('componentName', 'ZOOKEEPER_SERVER').map(function (item) {
-        return item.get('host.hostName') + ':' + zkPort;
+        return item.get('hostName') + ':' + zkPort;
       }).join(',');
 
     configProperties.findProperty('name', 'yarn.resourcemanager.hostname.rm1').set('value', currentRMHost).set('defaultValue', currentRMHost);

ambari-web/test/controllers/main/admin/highAvailability/resourceManager/step3_controller_test.js

@@ -246,21 +246,15 @@ describe('App.RMHighAvailabilityWizardStep3Controller', function () {
         return [
           Em.Object.create({
             componentName: 'ZOOKEEPER_SERVER',
-            host: {
               hostName: 'h2'
-            }
           }),
           Em.Object.create({
             componentName: 'ZOOKEEPER_SERVER',
-            host: {
               hostName: 'h3'
-            }
           }),
           Em.Object.create({
             componentName: 'RESOURCEMANAGER',
-            host: {
               hostName: 'h4'
-            }
           })
         ];
       });