remove addition of gate64 cpu

Nova has been fixed to not need this work around. We shouldn't keep it in devstack. Change-Id: Ie2b1c6b8ddce4a2fd94af06745d59455208f0633
openstack · Jun 3, 2016 · 214459c · 214459c
1 parent 35f0f09
commit 214459c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 100 deletions.
diff --git a/lib/nova_plugins/functions-libvirt b/lib/nova_plugins/functions-libvirt
@@ -121,18 +121,9 @@ EOF
         fi
     fi
 
-    # Update the libvirt cpu map with a gate64 cpu model. This enables nova
-    # live migration for 64bit guest OSes on heterogenous cloud "hardware".
-    if [[ -f /usr/share/libvirt/cpu_map.xml ]] ; then
-        sudo $TOP_DIR/tools/cpu_map_update.py /usr/share/libvirt/cpu_map.xml
-    fi
-
-    # libvirt detects various settings on startup, as we potentially changed
-    # the system configuration (modules, filesystems), we need to restart
-    # libvirt to detect those changes. Use a stop start as otherwise the new
-    # cpu_map is not loaded properly on some systems (Ubuntu).
-    stop_service $LIBVIRT_DAEMON
-    start_service $LIBVIRT_DAEMON
+    # Service needs to be started on redhat/fedora -- do a restart for
+    # sanity after fiddling the config.
+    restart_service $LIBVIRT_DAEMON
 }
 
 

diff --git a/tools/cpu_map_update.py b/tools/cpu_map_update.py