sshKey is empty, null otherwise
* @type {string|null}
*/
sshKeyError: function () {
- if (this.get('hasSubmitted') && this.get('manualInstall') === false && this.get('useSSH') && Em.isBlank(this.get('sshKey'))) {
+ if (this.get('hasSubmitted') && this.get('manualInstall') === false && !this.get('manualInstall') && Em.isBlank(this.get('sshKey'))) {
return Em.I18n.t('installer.step2.sshKey.error.required');
}
return null;
@@ -174,11 +196,13 @@ App.WizardStep2Controller = App.WizardStepController.extend({
return null;
}.property('agentUser', 'hasSubmitted', 'manualInstall'),
+ preRegisteredHostsError: Em.computed.and('manualInstall' ,'noPreRegisteredHosts'),
+
/**
* is Submit button disabled
* @type {bool}
*/
- isSubmitDisabled: Em.computed.or('hostsError', 'sshKeyError', 'sshUserError', 'sshPortError', 'agentUserError', 'App.router.btnClickInProgress'),
+ isSubmitDisabled: Em.computed.or('hostsError', 'sshKeyError', 'sshUserError', 'sshPortError', 'agentUserError', 'App.router.btnClickInProgress', 'preRegisteredHostsError'),
loadStep: function () {
//save initial hostNames value to check later if changes were made
@@ -197,22 +221,88 @@ App.WizardStep2Controller = App.WizardStepController.extend({
return installedHostsName;
}.property('content.hosts'),
+ /**
+ * get hosts that are installed manually
+ return
+ */
+ getManuallyInstalledHosts: function () {
+ App.ajax.send({
+ name: 'hosts.confirmed.install',
+ sender: this,
+ success: 'getManuallyInstalledHostsSuccessCallback'
+ });
+ },
+
+ getManuallyInstalledHostsSuccessCallback(response) {
+ var installedHosts = [],
+ self = this;
+ if (response.items.length > 0) {
+ response.items.forEach(function (item, indx) {
+ installedHosts.push(Em.Object.create({
+ 'controller': self,
+ 'hostName': item.Hosts.host_name,
+ 'cpuCount': item.Hosts.cpu_count,
+ 'memory': (parseFloat(item.Hosts.total_mem) / (1024 * 1024)).toFixed(2) + " GB",
+ 'freeSpace': (parseFloat(item.Hosts.disk_info[0].available) / (1024 * 1024)).toFixed(2) + " GB",
+ 'isVisible': true,
+
+ filterRow: function() {
+ var filter = self.get('filterText');
+ if(filter && !(item.Hosts.host_name.toUpperCase().indexOf(filter.toUpperCase()) > -1)) {
+ this.set('isVisible', false);
+ } else {
+ this.set('isVisible', true);
+ }
+ }.observes('controller.filterText')
+ }));
+ });
+ this.set('preRegisteredHostFound', Em.I18n.t('installer.step2.preRegistered.hostCount').format(installedHosts.length));
+ this.set('manuallyInstalledHosts', installedHosts);
+ this.set('noPreRegisteredHosts', false);
+ } else {
+ this.set('preRegisteredHostFound', Em.I18n.t('installer.step2.preRegistered.hostCount').format(0));
+ this.set('noPreRegisteredHosts', true);
+ this.set('manuallyInstalledHosts', []);
+ }
+ },
+
+ deleteRegisteredHost: function (event) {
+ var hostName = event.context;
+ App.ajax.send({
+ name: 'common.delete.registered.host',
+ sender: this,
+ data: {
+ hostName: event.context
+ },
+ success: 'deleteRegisteredHostSuccessCallback'
+ });
+ },
+
+ deleteRegisteredHostSuccessCallback: function (response) {
+ this.getManuallyInstalledHosts();
+ },
+
/**
* Set not installed hosts to the hostNameArr
* @method updateHostNameArr
*/
updateHostNameArr: function () {
- this.set('hostNameArr', this.get('hostNames').trim().split(new RegExp("\\s+", "g")));
- this.parseHostNamesAsPatternExpression();
- this.get('inputtedAgainHostNames').clear();
- var tempArr = [],
- hostNameArr = this.get('hostNameArr');
- for (var i = 0; i < hostNameArr.length; i++) {
- if (!this.get('installedHostNames').contains(hostNameArr[i])) {
- tempArr.push(hostNameArr[i]);
- }
- else {
- this.get('inputtedAgainHostNames').push(hostNameArr[i]);
+ var tempArr = [];
+ if (this.get('manualInstall')) {
+ tempArr = this.get('manuallyInstalledHosts').mapProperty('hostName');
+ } else {
+ this.set('hostNameArr', this.get('hostNames').trim().split(new RegExp("\\s+", "g")));
+ this.parseHostNamesAsPatternExpression();
+ this.get('inputtedAgainHostNames').clear();
+
+ var hostNameArr = this.get('hostNameArr');
+ for (var i = 0; i < hostNameArr.length; i++) {
+ if (!this.get('installedHostNames').contains(hostNameArr[i])) {
+ tempArr.push(hostNameArr[i]);
+ }
+ else {
+ this.get('inputtedAgainHostNames').push(hostNameArr[i]);
+ }
}
}
this.set('hostNameArr', tempArr);
@@ -237,12 +327,22 @@ App.WizardStep2Controller = App.WizardStepController.extend({
return result;
},
+ parseHosts: function () {
+ var hostNames = this.get('hostNames').trim().split(new RegExp("\\s+", "g"));
+ if (hostNames[0] == "") {
+ this.set('parsedHostsText', Em.I18n.t('installer.step2.parsedHostsPlaceholder').format(0));
+ } else {
+ var parsedHostNames = this.parseHostNamesAsPatternExpression(hostNames);
+ this.set('parsedHostsText', (Em.I18n.t('installer.step2.parsedHostsPlaceholder').format(parsedHostNames.length) + '\n' + parsedHostNames.join('\n')));
+ }
+ }.observes('hostNames'),
+
/**
* Set hostsError if host names don't pass validation
* @method checkHostError
*/
checkHostError: function () {
- if (Em.isEmpty(this.get('hostNames').trim())) {
+ if (!this.get('manualInstall') && Em.isEmpty(this.get('hostNames').trim())) {
this.set('hostsError', Em.I18n.t('installer.step2.hostName.error.required'));
}
else {
@@ -314,10 +414,6 @@ App.WizardStep2Controller = App.WizardStepController.extend({
return false;
}
- if (this.get('isPattern')) {
- this.hostNamePatternPopup(this.get('hostNameArr'));
- return false;
- }
if (this.get('inputtedAgainHostNames.length')) {
this.installedHostsPopup();
}
@@ -332,11 +428,13 @@ App.WizardStep2Controller = App.WizardStepController.extend({
* push hosts that match pattern in hostNameArr
* @method parseHostNamesAsPatternExpression
*/
- parseHostNamesAsPatternExpression: function () {
+ parseHostNamesAsPatternExpression: function (hostNamesToBeParsed) {
this.set('isPattern', false);
var hostNames = [];
- this.get('hostNameArr').forEach(function (a) {
+ var hostNameArr = hostNamesToBeParsed || this.get('hostNameArr');
+
+ hostNameArr.forEach(function (a) {
var hn,
allPatterns = a.match(/\[\d*\-\d*\]/g),
patternsNumber = allPatterns ? allPatterns.length : 0;
@@ -352,7 +450,11 @@ App.WizardStep2Controller = App.WizardStepController.extend({
}
}, this);
- this.set('hostNameArr', hostNames.uniq());
+ if(hostNamesToBeParsed) {
+ return hostNames;
+ } else {
+ this.set('hostNameArr', hostNames.uniq());
+ }
},
/**
@@ -406,12 +508,6 @@ App.WizardStep2Controller = App.WizardStepController.extend({
this.warningPopup();
return false;
}
-
- if (this.get('manualInstall') === true) {
- this.manualInstallPopup();
- return false;
- }
-
this.saveHosts();
App.router.send('next');
return true;
@@ -490,43 +586,6 @@ App.WizardStep2Controller = App.WizardStepController.extend({
});
},
- /**
- * Show notify that installation is manual
- * save hosts
- * @return {App.ModalPopup}
- * @method manualInstallPopup
- */
- manualInstallPopup: function () {
- var self = this;
- return App.ModalPopup.show({
- header: Em.I18n.t('installer.step2.manualInstall.popup.header'),
- onPrimary: function () {
- this.hide();
- self.saveHosts();
- App.router.send('next');
- },
- bodyClass: Em.View.extend({
- templateName: require('templates/wizard/step2ManualInstallPopup')
- })
- });
- },
-
- /**
- * Warn to manually install ambari-agent on each host
- * @method manualInstallWarningPopup
- */
- manualInstallWarningPopup: function () {
- if (!this.get('content.installOptions.useSsh')) {
- App.ModalPopup.show({
- header: Em.I18n.t('common.warning'),
- body: Em.I18n.t('installer.step2.manualInstall.info'),
- encodeBody: false,
- secondary: null
- });
- }
- this.set('content.installOptions.manualInstall', !this.get('content.installOptions.useSsh'));
- }.observes('content.installOptions.useSsh'),
-
/**
* Load java.home value frin server
* @method setAmbariJavaHome
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 55e2f17b737..70705ce748c 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -229,6 +229,8 @@ Em.I18n.translations = {
'common.more': 'More...',
'common.move':'Move',
'common.mpack': 'Management Pack',
+ 'common.freeStorage': 'Free Storage',
+ 'common.noHostsFound': 'No Hosts found.',
'common.na': 'n/a',
'common.name':'Name',
'common.next':'Next',
@@ -734,10 +736,11 @@ Em.I18n.translations = {
'installer.step1.checkAtLeastOneAttention': 'Attention: Please check at least one repository.',
'installer.step1.retryRepoUrls': 'Click here to retry.',
- 'installer.step2.header':'Install Options',
- 'installer.step2.body':'Enter the list of hosts to be included in the cluster and provide your SSH key.',
- 'installer.step2.targetHosts':'Target Hosts',
- 'installer.step2.targetHosts.info':'Enter a list of hosts using the Fully Qualified Domain Name (FQDN), one per line',
+ 'installer.step2.header':'Add Hosts',
+ 'installer.step2.registration.body1' : 'Ambari Agents can be automatically installed using SSH, or they can be manually installed and registered with the Ambari Server.',
+ 'installer.step2.registration.body2' : 'Please choose the installation type below:',
+ 'installer.step2.enterHosts':'Enter Hosts',
+ 'installer.step2.enterHosts.info':'Enter a list of hosts using the Fully Qualified Domain Name (FQDN), one per line',
'installer.step2.hostPattern.tooltip.title':'Pattern Expressions',
'installer.step2.hostPattern.tooltip.content':'You can use pattern expressions to specify a number of target hosts. For example, to specify host01.domain thru host10.domain, enter host[01-10].domain in the target hosts textarea.',
'installer.step2.hostName.error.required':'You must specify at least one host name',
@@ -768,15 +771,18 @@ Em.I18n.translations = {
'installer.step2.javaHome.tooltip.title' : 'JAVA_HOME',
'installer.step2.javaHome.tooltip.content' : 'Path to 64-bit JAVA_HOME. /usr/jdk/jdk1.6.0_31 is the default used by Ambari. You can override this to a specific path that contains the JDK. {{t installer.step2.targetHosts.info}}. {{t installer.step2.orUse}} +
{{t installer.step2.enterHosts.info}}. {{t installer.step2.orUse}}
-{{t installer.step2.useSsh.tooltip.title}}
{{#if view.isFileApi}}