openstack
/
fuel-web
Code Issues Proposed changes

Fix warning when stopping deployment on provisioning stage 

Related-Bug: #1538645

Change-Id: If085bf10c2eaaa74f0ea6a864dbefb55021c97a9
This commit is contained in:
Julia Aranovich 2016-02-03 16:42:56 +03:00 committed by Vitaly Kramskikh
parent d7d0e0a341
commit 9dfe300e7e
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nailgun/static/translations/core.json
View File

@ -1031,7 +1031,8 @@
"stop_deployment": { "stop_deployment": {
"title": "Stop Deployment", "title": "Stop Deployment",
"text": "Are you sure you want to stop this deployment? You may not be able to successfully re-deploy this OpenStack environment until you reset the environment. Proceed with caution!", "text": "Are you sure you want to stop this deployment? You may not be able to successfully re-deploy this OpenStack environment until you reset the environment. Proceed with caution!",
"provisioning_warning": "Are you sure you want to interrupt the deployment? If Fuel has not completed the node provisioning, changes applied to the nodes will be discarded and the nodes will be reset to their pre-deployment state.", "provisioning_warning": "Are you sure you want to interrupt the deployment at OS provisioning stage? Fuel has not completed the node provisioning, changes applied to the nodes will be discarded and the nodes will be reset to their pre-deployment state.",
"redeployment_warning": "Please wait 20 minutes before attempting to run the deployment again to ensure the provisioning process has been stopped.",
"stop_deployment_error": { "stop_deployment_error": {
"title": "Stop Deployment Error", "title": "Stop Deployment Error",
"stop_deployment_warning": "Unable to stop deployment" "stop_deployment_warning": "Unable to stop deployment"

13
nailgun/static/views/dialogs.js
View File

@ -531,12 +531,19 @@ export var StopDeploymentDialog = React.createClass({
}); });
}, },
renderBody() { renderBody() {
var ns = 'dialog.stop_deployment.';
return ( return (
<div className='text-danger'> <div className='text-danger'>
{this.renderImportantLabel()} {this.renderImportantLabel()}
{i18n('dialog.stop_deployment.' + {this.props.cluster.get('nodes').any({status: 'provisioning'}) ?
(this.props.cluster.get('nodes').where({status: 'provisioning'}).length ? <span>
'provisioning_warning' : 'text'))} {i18n(ns + 'provisioning_warning')}
<br/><br/>
{i18n(ns + 'redeployment_warning')}
</span>
:
i18n(ns + 'text')
}
</div> </div>
); );
}, },