Browse Source

Fix warning when stopping deployment on provisioning stage

Closes-Bug: #1538645

Change-Id: If085bf10c2eaaa74f0ea6a864dbefb55021c97a9
changes/32/275732/1
Julia Aranovich 5 years ago
parent
commit
741bf0ca72
2 changed files with 12 additions and 2 deletions
  1. +2
    -1
      nailgun/static/translations/core.json
  2. +10
    -1
      nailgun/static/views/dialogs.js

+ 2
- 1
nailgun/static/translations/core.json View File

@ -1030,7 +1030,8 @@
"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!",
"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": {
"title": "Stop Deployment Error",
"stop_deployment_warning": "Unable to stop deployment"


+ 10
- 1
nailgun/static/views/dialogs.js View File

@ -452,10 +452,19 @@ function($, _, i18n, Backbone, React, utils, models, dispatcher, controls, compo
}, this));
},
renderBody: function() {
var ns = 'dialog.stop_deployment.';
return (
<div className='text-danger'>
{this.renderImportantLabel()}
{i18n('dialog.stop_deployment.' + (this.props.cluster.get('nodes').where({status: 'provisioning'}).length ? 'provisioning_warning' : 'text'))}
{this.props.cluster.get('nodes').any({status: 'provisioning'}) ?
<span>
{i18n(ns + 'provisioning_warning')}
<br/><br/>
{i18n(ns + 'redeployment_warning')}
</span>
:
i18n(ns + 'text')
}
</div>
);
},


Loading…
Cancel
Save