From 4d3c301dc3f4d36b1f1e099dcd23f4d56205082c Mon Sep 17 00:00:00 2001
From: Kristine Bujold <kristine.bujold@windriver.com>
Date: Tue, 9 Oct 2018 14:58:29 -0400
Subject: [PATCH] Fix OAM Floating IP warning messages

When editing the OAM Floating IP in Horizon, the warning message does
not mention that the user needs to lock/unlock the controllers for the
changes to be applied. The warning messages now reflects that.

Closes-Bug: 1795960

Change-Id: I9117f768a9d423b538ce01db5659b2015880ef3b
Signed-off-by: Kristine Bujold <kristine.bujold@windriver.com>
---
 starlingx-dashboard/centos/build_srpm.data               | 2 +-
 .../templates/system_config/_update_coam_table.html      | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/starlingx-dashboard/centos/build_srpm.data b/starlingx-dashboard/centos/build_srpm.data
index dc85fff0..4576bc1d 100644
--- a/starlingx-dashboard/centos/build_srpm.data
+++ b/starlingx-dashboard/centos/build_srpm.data
@@ -1,2 +1,2 @@
 SRC_DIR="starlingx-dashboard"
-TIS_PATCH_VER=15
+TIS_PATCH_VER=16
diff --git a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/system_config/templates/system_config/_update_coam_table.html b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/system_config/templates/system_config/_update_coam_table.html
index ac53f5b8..1c755b29 100755
--- a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/system_config/templates/system_config/_update_coam_table.html
+++ b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/system_config/templates/system_config/_update_coam_table.html
@@ -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 %}