Merge "Add section "General HA scenario known issues""

diff --git a/ci/PR_revision.log b/ci/PR_revision.log
index ad51846..f8b11a7 100644 (file)
--- a/ci/PR_revision.log
+++ b/ci/PR_revision.log
@@ -39,4 +39,5 @@
 77,Update FDIO to use opendaylight_v2 mechanism driver
 78,Fix spelling mistake in specs filter
 79,Fix controller and compute ip array
-80,Change TenantNIC and PublicNIC to be role specific
\ No newline at end of file
+80,Change TenantNIC and PublicNIC to be role specific
+81,Fix duplicate NeutronServicePlugins

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 0a2eec2..ee0ea3b 100755 (executable)
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -225,11 +225,10 @@ main() {
     exit 1
   fi
   #Correct the time on the server prior to launching any VMs
-  ntpdate $ntp_server
-  if [ $? == 0 ]; then
+  if ntpdate $ntp_server; then
     hwclock --systohc
-    else
-        echo -e "${red} ERROR: ntpdate failed to update the time on the server. ${reset}"
+  else
+    echo "${blue}WARNING: ntpdate failed to update the time on the server. ${reset}"
   fi
   setup_undercloud_vm
   if [ "$virtual" == "TRUE" ]; then