summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
Diffstat (limited to 'ci')
-rw-r--r--ci/PR_revision.log4
-rwxr-xr-xci/deploy.sh7
2 files changed, 6 insertions, 5 deletions
diff --git a/ci/PR_revision.log b/ci/PR_revision.log
index 15787b95..f8b11a71 100644
--- a/ci/PR_revision.log
+++ b/ci/PR_revision.log
@@ -38,4 +38,6 @@
76,Add networking-vpp ML2 mechanism driver
77,Update FDIO to use opendaylight_v2 mechanism driver
78,Fix spelling mistake in specs filter
-79,Fix controller and compute ip array \ No newline at end of file
+79,Fix controller and compute ip array
+80,Change TenantNIC and PublicNIC to be role specific
+81,Fix duplicate NeutronServicePlugins
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 7f92702c..39eba881 100755
--- 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