Repository: ambari Updated Branches: refs/heads/trunk 0b77adc2f -> 3422b51e2
AMBARI-16002 Integrate Red Hat Satellite option in Ambari Web (zhewang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3422b51e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3422b51e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3422b51e Branch: refs/heads/trunk Commit: 3422b51e29e39c3bad43beda9336e438b6fa9679 Parents: 0b77adc Author: Zhe (Joe) Wang <[email protected]> Authored: Fri Apr 29 16:35:49 2016 -0700 Committer: Zhe (Joe) Wang <[email protected]> Committed: Fri Apr 29 16:35:49 2016 -0700 ---------------------------------------------------------------------- ambari-web/app/controllers/installer.js | 14 +++++++++++--- ambari-web/app/mappers/stack_mapper.js | 2 ++ ambari-web/app/models/stack.js | 1 + ambari-web/app/templates/wizard/step1.hbs | 2 +- ambari-web/app/utils/ajax/ajax.js | 2 +- .../stack_upgrade/upgrade_version_column_view.js | 1 - 6 files changed, 16 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/3422b51e/ambari-web/app/controllers/installer.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/installer.js b/ambari-web/app/controllers/installer.js index 39a7812..02511e8 100644 --- a/ambari-web/app/controllers/installer.js +++ b/ambari-web/app/controllers/installer.js @@ -341,7 +341,7 @@ App.InstallerController = App.WizardController.extend({ var versionData = self.getSelectedRepoVersionData(); if (versionData) { self.postVersionDefinitionFile(versionData.isXMLdata, versionData.data).done(function (versionInfo) { - self.mergeChanges(repos); + self.mergeChanges(repos, stacks); App.Stack.find().setEach('isSelected', false); App.Stack.find().findProperty('id', versionInfo.stackNameVersion + "-" + versionInfo.actualVersion).set('isSelected', true); self.setSelected(isStacksExistInDb); @@ -353,10 +353,16 @@ App.InstallerController = App.WizardController.extend({ }); }, - mergeChanges: function (repos) { + mergeChanges: function (repos, stacks) { repos.forEach(function (repo) { App.Repository.find().findProperty('id', repo.id).set('baseUrl', repo.base_url); }); + stacks.forEach(function (_stack) { + var stack = App.Stack.find().findProperty('id', _stack.id); + if (stack) { + stack.set('useRedhatSatellite', _stack.use_redhat_satellite); + } + }); }, setSelected: function (isStacksExistInDb) { @@ -782,10 +788,12 @@ App.InstallerController = App.WizardController.extend({ */ prepareRepoForSaving: function(repo) { var repoVersion = { "operating_systems": [] }; + var ambari_managed_repositories = !repo.get('useRedhatSatellite'); repo.get('operatingSystems').forEach(function (os, k) { repoVersion.operating_systems.push({ "OperatingSystems": { - "os_type": os.get("osType") + "os_type": os.get("osType"), + "ambari_managed_repositories": ambari_managed_repositories }, "repositories": [] }); http://git-wip-us.apache.org/repos/asf/ambari/blob/3422b51e/ambari-web/app/mappers/stack_mapper.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mappers/stack_mapper.js b/ambari-web/app/mappers/stack_mapper.js index 4f73612..e3fb8fc 100644 --- a/ambari-web/app/mappers/stack_mapper.js +++ b/ambari-web/app/mappers/stack_mapper.js @@ -37,6 +37,7 @@ App.stackMapper = App.QuickDataMapper.create({ max_jdk_version: 'max_jdk', is_selected: 'is_selected', config_types: 'config_types', + use_redhat_satellite: 'use_redhat_satellite', stack_services_key: 'stack_services', stack_services_type: 'array', stack_services: { @@ -136,6 +137,7 @@ App.stackMapper = App.QuickDataMapper.create({ servicesArray.pushObject(serviceObj); }, this); + stack.use_redhat_satellite = item.operating_systems[0].OperatingSystems.ambari_managed_repositories === false; stack.stack_services = servicesArray; stack.operating_systems = operatingSystemsArray; resultStack.push(this.parseIt(stack, this.get('configStack'))); http://git-wip-us.apache.org/repos/asf/ambari/blob/3422b51e/ambari-web/app/models/stack.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/stack.js b/ambari-web/app/models/stack.js index 992a79c..6023566 100644 --- a/ambari-web/app/models/stack.js +++ b/ambari-web/app/models/stack.js @@ -25,6 +25,7 @@ App.Stack = DS.Model.extend({ repositoryVersion: DS.attr('string'), showAvailable: DS.attr('boolean'), // All of the instances should have this value to true. We should map only those stacks that has this flag set to true type: DS.attr('string'), // ["PATCH", "STANDARD"] + useRedhatSatellite: DS.attr('boolean'), stackServices: DS.hasMany('App.ServiceSimple'), operatingSystems: DS.hasMany('App.OperatingSystem'), isSelected: DS.attr('boolean', {defaultValue: false}), http://git-wip-us.apache.org/repos/asf/ambari/blob/3422b51e/ambari-web/app/templates/wizard/step1.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/wizard/step1.hbs b/ambari-web/app/templates/wizard/step1.hbs index 0476580..2b5dc38 100644 --- a/ambari-web/app/templates/wizard/step1.hbs +++ b/ambari-web/app/templates/wizard/step1.hbs @@ -189,7 +189,7 @@ data-toggle="tooltip" {{translateAttr title="installer.step1.advancedRepo.skipValidation.tooltip"}}></i></label> </div> <div id="use-redhat"> - <label>{{view Ember.Checkbox classNames="align-checkbox" checkedBinding="useRedhatSatellite"}}{{t installer.step1.advancedRepo.useRedhatSatellite.message}} + <label>{{view Ember.Checkbox classNames="align-checkbox" checkedBinding="controller.selectedStack.useRedhatSatellite"}}{{t installer.step1.advancedRepo.useRedhatSatellite.message}} <i class="icon-question-sign" rel="use-redhat-tooltip" data-toggle="tooltip" {{translateAttr title="installer.step1.advancedRepo.useRedhatSatellite.tooltip"}}> </i> http://git-wip-us.apache.org/repos/asf/ambari/blob/3422b51e/ambari-web/app/utils/ajax/ajax.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/ajax/ajax.js b/ambari-web/app/utils/ajax/ajax.js index 83914a7..bccdc1b 100644 --- a/ambari-web/app/utils/ajax/ajax.js +++ b/ambari-web/app/utils/ajax/ajax.js @@ -2186,7 +2186,7 @@ var urls = { }, 'wizard.stacks_versions_definitions': { - 'real': '/version_definitions?fields=operating_systems/repositories/Repositories/*,VersionDefinition/stack_services,VersionDefinition/repository_version' + + 'real': '/version_definitions?fields=operating_systems/repositories/Repositories/*,operating_systems/OperatingSystems/*,VersionDefinition/stack_services,VersionDefinition/repository_version' + '&VersionDefinition/show_available=true&VersionDefinition/stack_name={stackName}', 'mock': '/data/wizard/stack/{stackName}_version_definitions.json' }, http://git-wip-us.apache.org/repos/asf/ambari/blob/3422b51e/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js index 168e8db..facba5e 100644 --- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js +++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js @@ -25,7 +25,6 @@ App.UpgradeVersionColumnView = App.UpgradeVersionBoxView.extend({ classNames: ['version-column', 'span4'], didInsertElement: function () { - App.tooltip($('.link-tooltip'), {title: Em.I18n.t('admin.stackVersions.version.linkTooltip')}); App.tooltip($('.out-of-sync-badge'), {title: Em.I18n.t('hosts.host.stackVersions.status.out_of_sync')}); //set the width, height of each version colum dynamically
