~gandelman-a/nova/libvirt_refresh_2

« back to all changes in this revision

Viewing changes to debian/patches/path-to-the-xenhost.conf-fixup.patch

  • Committer: Chuck Short
  • Date: 2012-02-29 20:08:26 UTC
  • mfrom: (312.1.5 debian-merge)
  • Revision ID: zulcss@ubuntu.com-20120229200826-3s2nektpbonk1dfs
* debain/control: Fix nova-compute-$flavor Depends
* debian/rules: Fix FTBFS.
* Merge Ubuntu/Debian packaging:
  - Thanks to Julien Danjou, Ghe Rivero, and Thomas Goirand
  - debian/copyright: Update copyright file.
  - debian/nova-api.init, debian/nova-compute.init,
    debian/nova-network.init, debian/nova-objectstore,
    debian/nova-scheduler, debian/nova-volume.init:
    Synchronize init scripts.
  - nova-common.install, debian/rules: Install policy.json
  - debian/rules, debian/nova-xcp-network.install,
    debian/nova-xcp-plugins.install, nova-xcp-plugins.postrm,
    debian/nova-xcp-plugins.doc, debian/nova-xcp-plugins.postinst,
    debian/README.xcp_and_openstack, debian/control,
    debian/ubuntu_xen-openvswitch-nova.rules,
    debian/patches/path-to-the-xenhost.conf-fixup.patch:
    Add Xen XCP support.
  - debian/control,
    debian/nova-compute-{kvm,lxc,qemu,xen,uml}.postinst: Make
    nova-compute a virtual package.
  - Dropped ubuntu_ubuntu_control_vars: We dont use it
* New upstream release.
* Dropped python-babel, it will be handled by langpacks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
Description: Fixes the path to the xenhost.conf file
 
2
Author: Thomas Goirand <zigo@debian.org>
 
3
Forwarded: not-needed
 
4
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost
 
5
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost
 
6
@@ -40,7 +40,7 @@
 
7
 pluginlib.configure_logging("xenhost")
 
8
 
 
9
 host_data_pattern = re.compile(r"\s*(\S+) \([^\)]+\) *: ?(.*)")
 
10
-config_file_path = "/usr/etc/xenhost.conf"
 
11
+config_file_path = "/etc/xcp/xenhost.conf"
 
12
 
 
13
 
 
14
 def jsonify(fnc):