From 1ca9d3c9df58f7ea28609cccac97a74d28fda4db Mon Sep 17 00:00:00 2001 From: Chris Behrens Date: Fri, 27 Jul 2012 06:20:16 +0000 Subject: Don't store system_metadata in xenstore Fixes bug 1029774 system_metadata should not be exposed to users. This reverts part of commit 82afe7ad5 / ChangeID I88a59f1b783 Change-Id: Id454dbcbafef861db3f88620a56d8dd2ccd30e1d --- nova/virt/xenapi/vmops.py | 6 ------ 1 file changed, 6 deletions(-) (limited to 'nova/virt') diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index 952612996..1113be28f 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -22,9 +22,7 @@ Management class for VM-related functions (spawn, reboot, etc). import cPickle as pickle import functools import itertools -import os import time -import uuid from eventlet import greenthread import netaddr @@ -46,7 +44,6 @@ from nova import utils from nova.virt import driver from nova.virt.xenapi import agent from nova.virt.xenapi import firewall -from nova.virt.xenapi import network_utils from nova.virt.xenapi import vm_utils from nova.virt.xenapi import volume_utils @@ -856,9 +853,6 @@ class VMOps(object): # Store user metadata store_meta('vm-data/user-metadata', instance['metadata']) - # Store system metadata - store_meta('vm-data/system-metadata', instance['system_metadata']) - def change_instance_metadata(self, instance, diff): """Apply changes to instance metadata to xenstore.""" vm_ref = self._get_vm_opaque_ref(instance) -- cgit