LGTM, thanks.
On Thu, Jul 25, 2013 at 3:41 PM, Guido Trotter <[email protected]> wrote: > commit c4c50c9ee4e5fb76b11f539e16345307ad7fb23c > Merge: 9d0d4f2 24f8fca > Author: Guido Trotter <[email protected]> > Date: Thu Jul 25 15:40:32 2013 +0200 > > Merge branch 'stable-2.8' into stable-2.9 > > * stable-2.8: > Update NEWS and version for Ganeti 2.7.1 > Add hvparam to disable VNET_HDR on tap devices > daemon-util: pass --oknodo at rotate_logs > Add logrotate example > daemon-util: provide rotate_logs and rotate_all_logs actions > Fix permission errors for split users > Make RAPI export device names and UUIDs > > Conflicts: > lib/constants.py: trivial > lib/rapi/rlib2.py: trivial > > Signed-off-by: Guido Trotter <[email protected]> > > diff --cc lib/constants.py > index fe4f88d,339ead8..0e721ba > --- a/lib/constants.py > +++ b/lib/constants.py > @@@ -957,8 -949,7 +957,9 @@@ HV_KVM_EXTRA = "kvm_extra > HV_KVM_MACHINE_VERSION = "machine_version" > HV_KVM_PATH = "kvm_path" > HV_VIF_TYPE = "vif_type" > +HV_VIF_SCRIPT = "vif_script" > +HV_XEN_CMD = "xen_cmd" > + HV_VNET_HDR = "vnet_hdr" > > > HVS_PARAMETER_TYPES = { > @@@ -1029,8 -1020,7 +1030,9 @@@ > HV_KVM_EXTRA: VTYPE_STRING, > HV_KVM_MACHINE_VERSION: VTYPE_STRING, > HV_VIF_TYPE: VTYPE_STRING, > + HV_VIF_SCRIPT: VTYPE_STRING, > + HV_XEN_CMD: VTYPE_STRING, > + HV_VNET_HDR: VTYPE_BOOL, > } > > HVS_PARAMETERS = frozenset(HVS_PARAMETER_TYPES.keys()) > @@@ -2156,10 -2105,9 +2158,11 @@@ HVC_DEFAULTS = > HV_VGA: "", > HV_KVM_EXTRA: "", > HV_KVM_MACHINE_VERSION: "", > + HV_VNET_HDR: True, > }, > - HT_FAKE: {}, > + HT_FAKE: { > + HV_MIGRATION_MODE: HT_MIGRATION_LIVE, > + }, > HT_CHROOT: { > HV_INIT_SCRIPT: "/ganeti-chroot", > }, > diff --cc lib/rapi/rlib2.py > index 8fef531,321ddb5..d8d9b8c > --- a/lib/rapi/rlib2.py > +++ b/lib/rapi/rlib2.py > @@@ -71,10 -71,10 +71,11 @@@ _COMMON_FIELDS = ["ctime", "mtime", "uu > I_FIELDS = ["name", "admin_state", "os", > "pnode", "snodes", > "disk_template", > - "nic.ips", "nic.macs", "nic.modes", > + "nic.ips", "nic.macs", "nic.modes", "nic.uuids", "nic.names", > "nic.links", "nic.networks", "nic.networks.names", > "nic.bridges", > "network_port", > - "disk.sizes", "disk.spindles", "disk_usage", > - "disk.sizes", "disk_usage", "disk.uuids", "disk.names", > ++ "disk.sizes", "disk.spindles", "disk_usage", "disk.uuids", > ++ "disk.names", > "beparams", "hvparams", > "oper_state", "oper_ram", "oper_vcpus", "status", > "custom_hvparams", "custom_beparams", "custom_nicparams", > -- Thomas Thrainer | Software Engineer | [email protected] | Google Germany GmbH Dienerstr. 12 80331 München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores
