From 85105d9d221155ac53135fda9d763bf095e516e8 Mon Sep 17 00:00:00 2001
From: Matt Riedemann <mriedem@us.ibm.com>
Date: Tue, 16 Aug 2016 10:39:25 -0400
Subject: [PATCH] nfs fix for xenial images

for Xenial there is no need to restart idmapd

Closes-Bug: #1590929

Change-Id: I50b1e72a787b0fcb80ac30bdba622afcad3c47be
---
 nova/tests/live_migration/hooks/nfs.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nova/tests/live_migration/hooks/nfs.sh b/nova/tests/live_migration/hooks/nfs.sh
index d6f177894a50..aac52cff3b9e 100755
--- a/nova/tests/live_migration/hooks/nfs.sh
+++ b/nova/tests/live_migration/hooks/nfs.sh
@@ -21,7 +21,10 @@ function nfs_setup {
 
     $ANSIBLE primary --sudo -f 5 -i "$WORKSPACE/inventory" -m shell -a "exportfs -a"
     $ANSIBLE primary --sudo -f 5 -i "$WORKSPACE/inventory" -m service -a "name=nfs-kernel-server state=restarted"
-    $ANSIBLE primary --sudo -f 5 -i "$WORKSPACE/inventory" -m service -a "name=idmapd state=restarted"
+    GetDistro
+    if [[ ! ${DISTRO} =~ (xenial) ]]; then
+        $ANSIBLE primary --sudo -f 5 -i "$WORKSPACE/inventory" -m service -a "name=idmapd state=restarted"
+    fi
     $ANSIBLE primary --sudo -f 5 -i "$WORKSPACE/inventory" -m shell -a "iptables -A INPUT -p tcp --dport 111 -j ACCEPT"
     $ANSIBLE primary --sudo -f 5 -i "$WORKSPACE/inventory" -m shell -a "iptables -A INPUT -p udp --dport 111 -j ACCEPT"
     $ANSIBLE primary --sudo -f 5 -i "$WORKSPACE/inventory" -m shell -a "iptables -A INPUT -p tcp --dport 2049 -j ACCEPT"