starlingx
/
gui
Code Issues Proposed changes

Merge "Fix OAM Floating IP warning messages"

This commit is contained in:
Zuul 2018-10-10 14:03:18 +00:00 committed by Gerrit Code Review
parent f1b9824cac 4d3c301dc3
commit 3654e275ad
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
starlingx-dashboard/centos/build_srpm.data
View File

@ -1,2 +1,2 @@
SRC_DIR="starlingx-dashboard"
TIS_PATCH_VER=15
TIS_PATCH_VER=16

9
starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/system_config/templates/system_config/_update_coam_table.html
View File

@ -16,16 +16,15 @@
<div class="right">
<h3>{% trans "Description" %}:</h3>
<p>{% trans "From here you can update the configuration of OAM External IP." %}</p>
<p>{% trans "WARNING: Completion of OAM configuration will take a few minutes." %}</p>
<p>{% trans "In that time, major alarms will be raised and then eventually cleared as affected services receive the new OAM settings. If the Floating IP has changed, you will have to re-login to this web application using the new Floating IP." %}</p>
<p>{% trans "WARNING: Completion of OAM configuration change will require lock and unlock of affected hosts." %}</p>
<p>{% trans "Major Alarms will be raised against the affected hosts until the lock unlock operation is successfully completed." %}</p>
</div>
{% endblock %}
{% block modal-footer %}
<a class="btn btn-default cancel" data-dismiss="modal">{% trans "Cancel" %}</a>
<input class="btn btn-primary btn-danger" type="submit" onclick="return confirm('WARNING: ' +
'Completion of OAM configuration will take a few minutes. ' +
'In that time, major alarms will be raised and then eventually cleared as affected services receive the new OAM settings. '+
'If the Floating IP has changed, you will have to re-login to this web application using the new Floating IP.');"
'Completion of OAM configuration change will require lock and unlock of affected hosts. ' +
'Major Alarms will be raised against the affected hosts until the lock unlock operation is successfully completed.');"
value="{% trans "Save" %}" />
{% endblock %}