diff options
| author | Joshua McKenty <jmckenty@joshua-mckentys-macbook-pro.local> | 2010-07-14 18:55:45 -0700 |
|---|---|---|
| committer | Joshua McKenty <jmckenty@joshua-mckentys-macbook-pro.local> | 2010-07-14 18:55:45 -0700 |
| commit | 6bae57730e5567e4f6a69b3eecf1684f15246a0a (patch) | |
| tree | c9f0d85ebd90456729855e9be8b243a85fd45e35 | |
| parent | 30032221e6cee3c04efade0fd2aae17c58a6fa14 (diff) | |
| parent | a1f6127369e8cdf1dc1ad056a138060be79dcf9e (diff) | |
| download | nova-6bae57730e5567e4f6a69b3eecf1684f15246a0a.tar.gz nova-6bae57730e5567e4f6a69b3eecf1684f15246a0a.tar.xz nova-6bae57730e5567e4f6a69b3eecf1684f15246a0a.zip | |
Merge branch 'master' of github.com:angst/cc
| -rw-r--r-- | debian/nova-common.install | 1 | ||||
| -rw-r--r-- | debian/nova-compute.conf | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/debian/nova-common.install b/debian/nova-common.install index 92b5d3d41..9b1bbf147 100644 --- a/debian/nova-common.install +++ b/debian/nova-common.install @@ -3,6 +3,7 @@ debian/nova-manage.conf etc/nova nova/auth/novarc.template usr/share/nova nova/cloudpipe/client.ovpn.template usr/share/nova nova/compute/libvirt.xml.template usr/share/nova +nova/compute/interfaces.template usr/share/nova usr/lib/python*/*-packages/nova/* CA/openssl.cnf.tmpl var/lib/nova/CA CA/geninter.sh var/lib/nova/CA diff --git a/debian/nova-compute.conf b/debian/nova-compute.conf index 5cd3f31ff..e4ca3fe95 100644 --- a/debian/nova-compute.conf +++ b/debian/nova-compute.conf @@ -3,6 +3,7 @@ --datastore_path=/var/lib/nova/keeper --instances_path=/var/lib/nova/instances --networks_path=/var/lib/nova/networks +--simple_network_template=/usr/share/nova/interfaces.template --libvirt_xml_template=/usr/share/nova/libvirt.xml.template --vpn_client_template=/usr/share/nova/client.ovpn.template --credentials_template=/usr/share/nova/novarc.template |