apevec pushed to openstack-nova (master). "Kilo release (..more)"

[notifications at fedoraproject.org]

>From 8945622d349ef552dbc182f60485f6807d7c8708 Mon Sep 17 00:00:00 2001
From: Alan Pevec <alan.pevec at redhat.com>
Date: Thu, 30 Apr 2015 16:09:21 +0200
Subject: Kilo release

update sample conf
archive old changelog entries ala glibc
 https://lists.fedoraproject.org/pipermail/glibc/2014-September/000061.html

Change-Id: I43ae07393ed9058a58fc258a4a4f3fd6bc34b884

diff --git a/.gitignore b/.gitignore
index 530ab45..5cb3715 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /nova-2015.1.0rc2.tar.gz
+/nova-2015.1.0.tar.gz
diff --git a/ChangeLog.old b/ChangeLog.old
new file mode 100644
index 0000000..2244337
--- /dev/null
+++ b/ChangeLog.old
@@ -0,0 +1,482 @@
+* Wed Mar 11 2015 Pádraig Brady <pbrady at redhat.com> - 2014.2.2-2
+- remove world-readable bit from /var/log/nova
+
+* Wed Feb 11 2015 Alan Pevec <alan.pevec at redhat.com> 2014.2.2-1
+- Update to upstream 2014.2.2
+
+* Tue Dec 09 2014 Pádraig Brady <pbrady at redhat.com> - 2014.2.1-1
+- Update to upstream 2014.2.1 release
+
+* Fri Oct 24 2014 Pádraig Brady <pbrady at redhat.com> - 2014.2-2
+- Fix openstack-nova-serialproxy.service to call correct binary
+
+* Mon Oct 20 2014 Alan Pevec <alan.pevec at redhat.com> 2014.2-1
+- Juno release
+
+* Mon Oct 20 2014 Pádraig Brady <pbrady at redhat.com> - 2014.2-0.8.rc2
+- Split spicehtml5proxy to subpackage and use standard package service control
+- Add novncproxy service to standard %%post package operation
+- Add new Juno serialproxy service
+
+* Sat Oct 11 2014 Alan Pevec <alan.pevec at redhat.com> 2014.2-0.7.rc2
+- Update to upstream 2014.2.rc2
+
+* Fri Oct 10 2014 Pádraig Brady <pbrady at redhat.com> - 2014.2-0.6rc1
+- Ensure all services are restarted on upgrade
+
+* Wed Oct 01 2014 Alan Pevec <alan.pevec at redhat.com> 2014.2-0.5rc1
+- Update to upstream 2014.2.rc1
+
+* Wed Sep 10 2014 Alan Pevec <apevec at redhat.com> 2014.2-0.3.b3
+- Update to Juno-3 milestone
+
+* Thu Aug 28 2014 Alan Pevec <apevec at redhat.com> 2014.2-0.2.b2
+- use keystonemiddleware
+- fix nova-api startup issue
+
+* Sun Aug 03 2014  Vladan Popovic <vpopovic at redhat.com> 2014.2-0.1.b2
+- Update to upstream 2014.2.b2
+- openstack-nova-compute should depend on libvirt-daemon-kvm, not libvirt - rhbz#996715
+- Use keystoneclient.middleware instead of keystonemiddleware
+
+* Thu Jun 26 2014 Vladan Popovic <vpopovic at redhat.com> 2014.1.1-2
+- Fixes rbd backend image size - rhbz#1112871
+
+* Fri Jun 13 2014 Nikola Đipanov <ndipanov at redhat.com> 2014.1.1-1
+- Update to latest stable/icehouse 2014.1.1 release
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2014.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Thu Apr 17 2014 Vladan Popovic <vpopovic at redhat.com> 2014.1-0.16
+- Update to upstream 2014.1
+
+* Fri Apr 11 2014 Vladan Popovic <vpopovic at redhat.com> 2014.1-0.15.rc2
+- Update to upstream 2014.1.rc2
+
+* Tue Apr 01 2014 Vladan Popovic <vpopovic at redhat.com> 2014.1-0.14.rc1
+- Update to upstream 2014.1.rc1
+- Introduce new systemd-rpm macros in openstack-nova spec file - rhbz#850252
+- Fix double logging when using syslog - rhbz#966050
+
+* Wed Mar 19 2014 Vladan Popovic <vpopovic at redhat.com> - 2014.1-0.13.b3
+- Update python.oslo.messaging requirement to 1.3.0-0.1.a4 - rhbz#1077860
+
+* Fri Mar 07 2014 Vladan Popovic <vpopovic at redhat.com> - 2014.1-0.12.b3
+- Update to Icehouse milestone 3
+
+* Mon Feb 03 2014 Pádraig Brady <pbrady at redhat.com> - 2014.1-0.11.b2
+- Avoid commented [DEFAULT] config issue in nova.conf
+
+* Wed Jan 29 2014 Xavier Queralt <xqueralt at redhat.com> - 2014.1-0.10.b2
+- Remove unneeded requirement on vconfig
+
+* Wed Jan 29 2014 Xavier Queralt <xqueralt at redhat.com> - 2014.1-0.9.b2
+- Add build requirement on python-six
+
+* Mon Jan 27 2014 Xavier Queralt <xqueralt at redhat.com> - 2014.1-0.8.b2
+- Fix the patch for CVE-2013-7130 which was not backported properly
+
+* Fri Jan 24 2014 Xavier Queralt <xqueralt at redhat.com> - 2014.1-0.7.b2
+- Restore pbr patch dropped in the last version by mistake
+
+* Fri Jan 24 2014 Xavier Queralt <xqueralt at redhat.com> - 2014.1-0.6.b2
+- Update to Icehouse milestone 2
+- Require python-keystoneclient for api-paste - rhbz#909113
+- Fix root disk leak in live migration - CVE-2013-7130
+
+* Mon Jan 06 2014 Pádraig Brady <pbrady at redhat.com> - 2014.1-0.5.b1
+- Avoid [keystone_authtoken] config corruption in nova.conf
+
+* Mon Jan 06 2014 Pádraig Brady <pbrady at redhat.com> - 2014.1-0.4.b1
+- Set python-six min version to ensure updated
+
+* Tue Dec 17 2013 Pádraig Brady <pbrady at redhat.com> - 2014.1-0.3.b1
+- Rotate log files by size rather than by age - rhbz#867747
+
+* Mon Dec 16 2013 Xavier Queralt <xqueralt at redhat.com> - 2014.1-0.2.b1
+- Add python-oslo-sphinx to build requirements
+
+* Mon Dec 16 2013 Xavier Queralt <xqueralt at redhat.com> - 2014.1-0.1.b1
+- Update to Icehouse milestone 1
+
+* Tue Dec 03 2013 Xavier Queralt <xqueralt at redhat.com> - 2013.2-4
+- Fix the CVE number references from the latest change
+
+* Mon Nov 18 2013 Xavier Queralt <xqueralt at redhat.com> - 2013.2-3
+- Remove cert and scheduler hard dependency on cinderclient - rhbz#1031679
+- Require ipmitool for baremetal driver - rhbz#1022243
+- Ensure we don't boot oversized images (CVE-2013-4463 and CVE-2013-2096)
+
+* Wed Oct 23 2013 Xavier Queralt <xqueralt at redhat.com> - 2013.2-2
+- Depend on python-oslo-config >= 1:1.2.0 so it gets upgraded automatically - rhbz#1014835
+- remove signing_dir from nova-dist.conf to use the default - rhbz#957485
+- Require bridge-utils on nova-compute package - rhbz#1009065
+
+* Thu Oct 17 2013 Xavier Queralt <xqueralt at redhat.com> - 2013.2-1
+- Update to Havana final
+
+* Tue Oct 15 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.2-0.26.rc2
+- Update to Havana rc1
+
+* Thu Oct 03 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.2-0.23.rc1
+- Update to Havana rc1
+
+* Thu Sep 12 2013 Pádraig Brady <pbrady at redhat.com> - 2013.2-0.20.b3
+- Depend on genisoimage to support creating guest config drives
+
+* Mon Sep 09 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.2-0.19.b3
+- Fix compute_node_get_all() for Nova Baremetal
+
+* Mon Sep 09 2013 Pádraig Brady <pbrady at redhat.com> - 2013.2-0.18.b3
+- Avoid deprecated options in distribution config files
+
+* Mon Sep 09 2013 Dan Prince <dprince at redhat.com> - 2013.2-0.17.b3
+- Add dependency on python-babel
+- Add dependency on python-jinja2
+
+* Mon Sep 09 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.2-0.16.b3
+- Update to Havana milestone 3
+
+* Tue Aug 27 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.2-0.15.b2
+- Fix the tarball download link (SOURCE0)
+
+* Tue Aug 27 2013 Xavier Queralt <xqueralt at redhat.com> - 2013.2-0.14.b2
+- Set auth_version=v2.0 in nova-dist.conf to avoid http://pad.lv/1154809
+
+* Tue Aug 27 2013 Xavier Queralt <xqueralt at redhat.com> - 2013.2-0.13.b2
+- Remove Folsom release deprecated config options from nova-dist.conf
+
+* Tue Aug 27 2013 Xavier Queralt <xqueralt at redhat.com> - 2013.2-0.12.b2
+- Add the second dhcpbridge-flagfile to nova-dist.conf 
+
+* Tue Aug 27 2013 Xavier Queralt <xqueralt at redhat.com> - 2013.2-0.11.b2
+- Change the default config to poll for DB connection indefinitely
+
+* Wed Aug 07 2013 Xavier Queralt <xqueralt at redhat.com> - 2013.2-0.10.b2
+- Create a nova-dist.conf file with default values under /usr/share
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2013.2-0.9.b2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Mon Jul 22 2013 Pádraig Brady <pbrady at redhat.com> - 2013.2-0.8.b2
+- Update to Havana milestone 2
+
+* Mon Jun 24 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.2-0.6.b1
+- Add the novncproxy subpackage (moved from the novnc package)
+
+* Mon Jun 24 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.2-0.4.h1
+- Remove requirements file to be more flexible with dep versions
+
+* Fri Jun 14 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.2-0.3.h1
+- Fix an issue with the version string
+
+* Mon Jun 10 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.2-0.2.h1
+- Add a runtime dep on python-six
+- Fix verision reporting
+
+* Fri Jun 07 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.2-0.1.h1
+- Update to Havana milestone 1
+- Add a build-time dep on python-d2to1
+- Add a build-time dep on python-pbr
+
+* Fri May 17 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.1-2
+- Check QCOW2 image size during root disk creation (CVE-2013-2096)
+
+* Mon May 13 2013 Pádraig Brady <pbrady at redhat.com> - 2013.1.1-1
+- Update to stable/grizzly 2013.1.1 release
+
+* Fri May 10 2013 Pádraig Brady <pbrady at redhat.com> - 2013.1-3
+- Make openstack-nova-network depend on ebtables #961567
+
+* Thu Apr 11 2013 Pádraig Brady <pbrady at redhat.com> - 2013.1-2
+- Fix nova network dnsmasq invocation failure #951144
+
+* Mon Apr 08 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.1-1
+- Update to Grizzly final
+
+* Tue Apr 02 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.1-0.12.rc2
+- Update to Grizzly rc2
+
+* Fri Mar 22 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.1-0.11.rc1
+- Update to Grizzly rc1
+
+* Wed Mar 20 2013 Pádraig Brady - 2013.1-0.10.g3
+- Remove /etc/tgt/conf.d/nova.conf which was invalid for grizzly
+
+* Tue Mar 12 2013 Pádraig Brady - 2013.1-0.9.g3
+- Allow openstack-nova-doc to be installed in isolation
+
+* Thu Feb 28 2013 Dan Prince <dprince at redhat.com> - 2013.1-0.8.g3
+- Use LIBGUESTFS_ATTACH_METHOD=appliance to allow injection to work
+
+* Tue Feb 26 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.1-0.7.g3
+- Fix dependency issues caused by the Milestone 3 update
+
+* Mon Feb 25 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.1-0.6.g3
+- Update to Grizzly milestone 3
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2013.1-0.5.g2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Fri Jan 11 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.1-0.4.g2
+- Update to Grizzly milestone 2
+- Add the version info file
+- Add python-stevedore dependency
+- Add the cells subpackage and service file
+
+* Thu Dec 06 2012 Nikola Đipanov <ndipanov at redhat.com> - 2013.1-0.3.g1
+- signing_dir renamed from incorrect signing_dirname in default nova.conf
+
+* Thu Nov 29 2012 Nikola Đipanov <ndipanov at redhat.com> 2013.1-0.2.g1
+-Fix a few spec file issues introduced by the Grizzly update
+
+* Wed Nov 28 2012 Nikola Đipanov <ndipanov at redhat.com> 2013.1-0.1.g1
+- Update to Grizzly milestone 1
+- Remove volume subpackage - removed from Grizzly
+- Add the conductor subpackage - new service added in Grizzly
+- Depend on python-libguestfs instead of libguestfs-mount
+- Don't add the nova user to the group fuse
+- Removes openstack-utils from requirements for nova-common
+
+* Thu Sep 27 2012 Pádraig Brady <pbrady at redhat.com> - 2012.2-1
+- Update to folsom final
+
+* Wed Sep 26 2012 Pádraig Brady <pbrady at redhat.com> - 2012.2-0.11.rc1
+- Support newer polkit config format to allow communication with libvirtd
+- Fix to ensure that tgt configuration is honored
+
+* Fri Sep 21 2012 Pádraig Brady <pbrady at redhat.com> - 2012.2-0.8.rc1
+- Update to folsom rc1
+
+* Mon Sep 17 2012 Alan Pevec <apevec at redhat.com> - 2012.2-0.7.f3
+- Remove user config from paste ini files
+
+* Mon Aug 27 2012 Pádraig Brady <P at draigBrady.com> - 2012.2-0.6.f3
+- Update to folsom milestone 3
+
+* Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2012.2-0.4.f1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Jun 08 2012 Pádraig Brady <P at draigBrady.com> - 2012.2-0.3.f1
+- Enable libguestfs image inspection
+
+* Wed Jun 06 2012 Pádraig Brady <P at draigBrady.com> - 2012.2-0.2.f1
+- Fix up protocol case handling for security groups (CVE-2012-2654)
+
+* Tue May 29 2012 Pádraig Brady <P at draigBrady.com> - 2012.2-0.1.f1
+- Update to folsom milestone 1
+
+* Wed May 16 2012 Alan Pevec <apevec at redhat.com> - 2012.1-6
+- Remove m2crypto and other dependencies no loner needed by Essex
+
+* Wed May 16 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-5
+- Sync up with Essex stable branch
+- Handle updated qemu-img info output
+- Remove redundant and outdated openstack-nova-db-setup
+
+* Wed May 09 2012 Alan Pevec <apevec at redhat.com> - 2012.1-4
+- Remove the socat dependency no longer needed by Essex
+
+* Fri Apr 27 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-3
+- Reference new Essex services at installation
+
+* Wed Apr 18 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-2
+- Sync up with Essex stable branch
+- Support more flexible guest image file injection
+- Enforce quota on security group rules (#814275, CVE-2012-2101)
+- Provide startup scripts for the Essex VNC services
+- Provide a startup script for the separated metadata api service
+
+* Sun Apr  8 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-1
+- Update to Essex release
+
+* Thu Mar 29 2012 Russell Bryant <rbryant at redhat.com> 2012.1-0.10.rc1
+- Remove the outdated nova-debug tool
+- CVE-2012-1585 openstack-nova: Long server names grow nova-api log files significantly
+
+* Mon Mar 26 2012 Mark McLoughlin <markmc at redhat.com> - 2012.1-0.9.rc1
+- Avoid killing dnsmasq on network service shutdown (#805947)
+
+* Tue Mar 20 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-0.8.rc1
+- Update to Essex release candidate 1
+
+* Fri Mar 16 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-0.8.e4
+- Include an upstream fix for errors logged when syncing power states
+- Support non blocking libvirt operations
+- Fix an exception when querying a server through the API (#803905)
+- Suppress deprecation warnings with db sync at install (#801302)
+- Avoid and cater for missing libvirt instance images (#801791)
+
+* Tue Mar  6 2012 Alan Pevec <apevec at redhat.com> - 2012.1-0.7.e4
+- Fixup permissions on nova config files
+
+* Tue Mar  6 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-0.6.e4
+- Depend on bridge-utils
+- Support fully transparent handling of the new ini config file
+
+* Fri Mar  2 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-0.5.e4
+- Update to Essex milestone 4.
+- explicitly select the libvirt firewall driver in default nova.conf.
+- Add dependency on python-iso8601.
+- Enable --force_dhcp_release.
+- Switch to the new ini format config file.
+
+* Mon Feb 13 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-0.4.e3
+- Support --force_dhcp_release (#788485)
+
+* Thu Feb  2 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-0.3.e3
+- Suppress a warning from `nova-manage image convert`
+- Add the openstack-nova-cert service which now handles the CA folder
+- Change the default message broker from rabbitmq to qpid
+- Enable the new rootwrap helper, to minimize sudo config
+
+* Fri Jan 27 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-0.2.e3
+- Suppress erroneous output to stdout on package install (#785115)
+- Specify a connection_type in nova.conf, needed by essex-3
+- Depend on python-carrot, currently needed by essex-3
+- Remove the rabbitmq-server dependency as it's now optional
+- Have python-nova depend on the messaging libs, not openstack-nova
+
+* Thu Jan 26 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-0.1.e3
+- Update to essex milestone 3
+
+* Mon Jan 23 2012 Pádraig Brady <P at draigBrady.com> - 2011.3.1-2
+- Fix a REST API v1.0 bug causing a regression with deltacloud
+
+* Fri Jan 20 2012 Pádraig Brady <P at draigBrady.com> - 2011.3.1-1
+- Update to 2011.3.1 release
+- Allow empty mysql root password in mysql setup script
+- Enable mysqld at boot in mysql setup script
+
+* Wed Jan 18 2012 Mark McLoughlin <markmc at redhat.com> - 2011.3.1-0.4.10818%{?dist}
+- Update to latest 2011.3.1 release candidate
+- Re-add nova-{clear-rabbit-queues,instance-usage-audit}
+
+* Tue Jan 17 2012 Mark McLoughlin <markmc at redhat.com> - 2011.3.1-0.3.10814
+- nova-stack isn't missing after all
+
+* Tue Jan 17 2012 Mark McLoughlin <markmc at redhat.com> - 2011.3.1-0.2.10814
+- nova-{stack,clear-rabbit-queues,instance-usage-audit} temporarily removed because of lp#917676
+
+* Tue Jan 17 2012 Mark McLoughlin <markmc at redhat.com> - 2011.3.1-0.1.10814
+- Update to 2011.3.1 release candidate
+- Only adds 4 patches from upstream which we didn't already have
+
+* Wed Jan 11 2012 Pádraig Brady <P at draigBrady.com> - 2011.3-19
+- Fix libguestfs support for specified partitions
+- Fix tenant bypass by authenticated users using API (#772202, CVE-2012-0030)
+
+* Fri Jan  6 2012 Mark McLoughlin <markmc at redhat.com> - 2011.3-18
+- Fix up recent patches which don't apply
+
+* Fri Jan  6 2012 Mark McLoughlin <markmc at redhat.com> - 2011.3-17
+- Backport tgtadm off-by-one fix from upstream (#752709)
+
+* Fri Jan  6 2012 Mark McLoughlin <markmc at redhat.com> - 2011.3-16
+- Rebase to latest upstream stable/diablo, pulling in ~50 patches
+
+* Fri Jan  6 2012 Mark McLoughlin <markmc at redhat.com> - 2011.3-15
+- Move recent patches into git (no functional changes)
+
+* Fri Dec 30 2011 Pádraig Brady <P at draigBrady.com> - 2011.3-14
+- Don't require the fuse group (#770927)
+- Require the fuse package (to avoid #767852)
+
+* Wed Dec 14 2011 Pádraig Brady <P at draigBrady.com> - 2011.3-13
+- Sanitize EC2 manifests and image tarballs (#767236, CVE 2011-4596)
+- update libguestfs support
+
+* Tue Dec 06 2011 Russell Bryant <rbryant at redhat.com> - 2011.3-11
+- Add --yes, --rootpw, and --novapw options to openstack-nova-db-setup.
+
+* Wed Nov 30 2011 Pádraig Brady <P at draigBrady.com> - 2011.3-10
+- Add libguestfs support
+
+* Tue Nov 29 2011 Pádraig Brady <P at draigBrady.com> - 2011.3-9
+- Update the libvirt dependency from 0.8.2 to 0.8.7
+- Ensure we don't access the net when building docs
+
+* Tue Nov 29 2011 Russell Bryant <rbryant at redhat.com> - 2011.3-8
+- Change default database to mysql. (#735012)
+
+* Mon Nov 14 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-7
+- Add ~20 significant fixes from upstream stable branch
+
+* Wed Oct 26 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-6
+- Fix password leak in EC2 API (#749385, CVE 2011-4076)
+
+* Mon Oct 24 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-5
+- Fix block migration (#741690)
+
+* Mon Oct 17 2011 Bob Kukura <rkukura at redhat.com> - 2011.3-4
+- Add dependency on python-amqplib (#746685)
+
+* Wed Sep 28 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-3
+- Fix lazy load exception with security groups (#741307)
+- Fix issue with nova-network deleting the default route (#741686)
+- Fix errors caused by MySQL connection pooling (#741312)
+
+* Mon Sep 26 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-2
+- Manage the package's patches in git; no functional changes.
+
+* Thu Sep 22 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-1
+- Update to Diablo final.
+- Drop some upstreamed patches.
+- Update the metadata-accept patch to what's proposed for essex.
+- Switch rpc impl from carrot to kombu.
+
+* Mon Sep 19 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-0.10.d4
+- Use tgtadm instead of ietadm (#737046)
+
+* Wed Sep 14 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-0.9.d4
+- Remove python-libguestfs dependency (#738187)
+
+* Mon Sep  5 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-0.8.d4
+- Add iptables rule to allow EC2 metadata requests (#734347)
+
+* Sat Sep  3 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-0.7.d4
+- Add iptables rules to allow requests to dnsmasq (#734347)
+
+* Wed Aug 31 2011 Angus Salkeld <asalkeld at redhat.com> - 2011.3-0.6.d4
+- Add the one man page provided by nova.
+- Start services with --flagfile rather than --flag-file (#735070)
+
+* Tue Aug 30 2011 Angus Salkeld <asalkeld at redhat.com> - 2011.3-0.5.d4
+- Switch from SysV init scripts to systemd units (#734345)
+
+* Mon Aug 29 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-0.4.d4
+- Don't generate root CA during %%post (#707199)
+- The nobody group shouldn't own files in /var/lib/nova
+- Add workaround for sphinx-build segfault
+
+* Fri Aug 26 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-0.3.d4
+- Update to diablo-4 milestone
+- Use statically assigned uid:gid 162:162 (#732442)
+- Collapse all sub-packages into openstack-nova; w/o upgrade path
+- Reduce use of macros
+- Rename stack to nova-stack
+- Fix openssl.cnf.tmpl script-without-shebang rpmlint warning
+- Really remove ajaxterm
+- Mark polkit file as %%config
+
+* Mon Aug 22 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-0.2.1449bzr
+- Remove dependency on python-novaclient
+
+* Wed Aug 17 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-0.1.1449bzr
+- Update to latest upstream.
+- nova-import-canonical-imagestore has been removed
+- nova-clear-rabbit-queues was added
+
+* Tue Aug  9 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-0.2.1409bzr
+- Update to newer upstream
+- nova-instancemonitor has been removed
+- nova-instance-usage-audit added
+
+* Tue Aug  9 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-0.1.bzr1130
+- More cleanups
+- Change release tag to reflect pre-release status
+
+* Wed Jun 29 2011 Matt Domsch <mdomsch at fedoraproject.org> - 2011.3-1087.1
+- Initial package from Alexander Sakhnov <asakhnov at mirantis.com>
+  with cleanups by Matt Domsch
diff --git a/nova.conf.sample b/nova.conf.sample
index abda215..771d664 100644
--- a/nova.conf.sample
+++ b/nova.conf.sample
@@ -1,191 +1,6 @@
 [DEFAULT]
 
 #
-# Options defined in oslo.messaging
-#
-
-# Use durable queues in amqp. (boolean value)
-# Deprecated group/name - [DEFAULT]/rabbit_durable_queues
-#amqp_durable_queues=false
-
-# Auto-delete queues in amqp. (boolean value)
-#amqp_auto_delete=false
-
-# Size of RPC connection pool. (integer value)
-#rpc_conn_pool_size=30
-
-# Qpid broker hostname. (string value)
-#qpid_hostname=localhost
-
-# Qpid broker port. (integer value)
-#qpid_port=5672
-
-# Qpid HA cluster host:port pairs. (list value)
-#qpid_hosts=$qpid_hostname:$qpid_port
-
-# Username for Qpid connection. (string value)
-#qpid_username=
-
-# Password for Qpid connection. (string value)
-#qpid_password=
-
-# Space separated list of SASL mechanisms to use for auth.
-# (string value)
-#qpid_sasl_mechanisms=
-
-# Seconds between connection keepalive heartbeats. (integer
-# value)
-#qpid_heartbeat=60
-
-# Transport to use, either 'tcp' or 'ssl'. (string value)
-#qpid_protocol=tcp
-
-# Whether to disable the Nagle algorithm. (boolean value)
-#qpid_tcp_nodelay=true
-
-# The number of prefetched messages held by receiver. (integer
-# value)
-#qpid_receiver_capacity=1
-
-# The qpid topology version to use.  Version 1 is what was
-# originally used by impl_qpid.  Version 2 includes some
-# backwards-incompatible changes that allow broker federation
-# to work.  Users should update to version 2 when they are
-# able to take everything down, as it requires a clean break.
-# (integer value)
-#qpid_topology_version=1
-
-# SSL version to use (valid only if SSL enabled). valid values
-# are TLSv1, SSLv23 and SSLv3. SSLv2 may be available on some
-# distributions. (string value)
-#kombu_ssl_version=
-
-# SSL key file (valid only if SSL enabled). (string value)
-#kombu_ssl_keyfile=
-
-# SSL cert file (valid only if SSL enabled). (string value)
-#kombu_ssl_certfile=
-
-# SSL certification authority file (valid only if SSL
-# enabled). (string value)
-#kombu_ssl_ca_certs=
-
-# How long to wait before reconnecting in response to an AMQP
-# consumer cancel notification. (floating point value)
-#kombu_reconnect_delay=1.0
-
-# The RabbitMQ broker address where a single node is used.
-# (string value)
-#rabbit_host=localhost
-
-# The RabbitMQ broker port where a single node is used.
-# (integer value)
-#rabbit_port=5672
-
-# RabbitMQ HA cluster host:port pairs. (list value)
-#rabbit_hosts=$rabbit_host:$rabbit_port
-
-# Connect over SSL for RabbitMQ. (boolean value)
-#rabbit_use_ssl=false
-
-# The RabbitMQ userid. (string value)
-#rabbit_userid=guest
-
-# The RabbitMQ password. (string value)
-#rabbit_password=guest
-
-# the RabbitMQ login method (string value)
-#rabbit_login_method=AMQPLAIN
-
-# The RabbitMQ virtual host. (string value)
-#rabbit_virtual_host=/
-
-# How frequently to retry connecting with RabbitMQ. (integer
-# value)
-#rabbit_retry_interval=1
-
-# How long to backoff for between retries when connecting to
-# RabbitMQ. (integer value)
-#rabbit_retry_backoff=2
-
-# Maximum number of RabbitMQ connection retries. Default is 0
-# (infinite retry count). (integer value)
-#rabbit_max_retries=0
-
-# Use HA queues in RabbitMQ (x-ha-policy: all). If you change
-# this option, you must wipe the RabbitMQ database. (boolean
-# value)
-#rabbit_ha_queues=false
-
-# If passed, use a fake RabbitMQ provider. (boolean value)
-#fake_rabbit=false
-
-# ZeroMQ bind address. Should be a wildcard (*), an ethernet
-# interface, or IP. The "host" option should point or resolve
-# to this address. (string value)
-#rpc_zmq_bind_address=*
-
-# MatchMaker driver. (string value)
-#rpc_zmq_matchmaker=oslo.messaging._drivers.matchmaker.MatchMakerLocalhost
-
-# ZeroMQ receiver listening port. (integer value)
-#rpc_zmq_port=9501
-
-# Number of ZeroMQ contexts, defaults to 1. (integer value)
-#rpc_zmq_contexts=1
-
-# Maximum number of ingress messages to locally buffer per
-# topic. Default is unlimited. (integer value)
-#rpc_zmq_topic_backlog=<None>
-
-# Directory for holding IPC sockets. (string value)
-#rpc_zmq_ipc_dir=/var/run/openstack
-
-# Name of this node. Must be a valid hostname, FQDN, or IP
-# address. Must match "host" option, if running Nova. (string
-# value)
-#rpc_zmq_host=nova
-
-# Seconds to wait before a cast expires (TTL). Only supported
-# by impl_zmq. (integer value)
-#rpc_cast_timeout=30
-
-# Heartbeat frequency. (integer value)
-#matchmaker_heartbeat_freq=300
-
-# Heartbeat time-to-live. (integer value)
-#matchmaker_heartbeat_ttl=600
-
-# Size of RPC greenthread pool. (integer value)
-#rpc_thread_pool_size=64
-
-# Driver or drivers to handle sending notifications. (multi
-# valued)
-#notification_driver=
-
-# AMQP topic used for OpenStack notifications. (list value)
-# Deprecated group/name - [rpc_notifier2]/topics
-#notification_topics=notifications
-
-# Seconds to wait for a response from a call. (integer value)
-#rpc_response_timeout=60
-
-# A URL representing the messaging driver to use and its full
-# configuration. If not set, we fall back to the rpc_backend
-# option and driver specific configuration. (string value)
-#transport_url=<None>
-
-# The messaging driver to use, defaults to rabbit. Other
-# drivers include qpid and zmq. (string value)
-#rpc_backend=rabbit
-
-# The default exchange under which topics are scoped. May be
-# overridden by an exchange name specified in the
-# transport_url option. (string value)
-#control_exchange=openstack
-
-
-#
 # Options defined in nova.availability_zones
 #
 
@@ -243,6 +58,9 @@
 # IP address of this host (string value)
 #my_ip=10.0.0.1
 
+# Block storage IP address of this host (string value)
+#my_block_storage_ip=$my_ip
+
 # Name of this node.  This can be an opaque identifier.  It is
 # not necessarily a hostname, FQDN, or IP address. However,
 # the node name must be valid within an AMQP key, and if using
@@ -325,7 +143,6 @@
 #quota_injected_file_content_bytes=10240
 
 # Length of injected file path (integer value)
-# Deprecated group/name - [DEFAULT]/quota_injected_file_path_bytes
 #quota_injected_file_path_length=255
 
 # Number of security groups per project (integer value)
@@ -347,11 +164,18 @@
 # value)
 #reservation_expire=86400
 
-# Count of reservations until usage is refreshed (integer
-# value)
+# Count of reservations until usage is refreshed. This
+# defaults to 0(off) to avoid additional load but it is useful
+# to turn on to help keep quota usage up to date and reduce
+# the impact of out of sync usage issues. (integer value)
 #until_refresh=0
 
-# Number of seconds between subsequent usage refreshes
+# Number of seconds between subsequent usage refreshes. This
+# defaults to 0(off) to avoid additional load but it is useful
+# to turn on to help keep quota usage up to date and reduce
+# the impact of out of sync usage issues. Note that quotas are
+# not updated on a periodic task, they will update on a new
+# reservation if max_age has passed since the last reservation
 # (integer value)
 #max_age=0
 
@@ -444,14 +268,6 @@
 
 
 #
-# Options defined in nova.test
-#
-
-# File name of clean sqlite db (string value)
-#sqlite_clean_db=clean.sqlite
-
-
-#
 # Options defined in nova.utils
 #
 
@@ -515,6 +331,16 @@
 # with big service catalogs). (integer value)
 #max_header_line=16384
 
+# If False, closes the client socket connection explicitly.
+# (boolean value)
+#wsgi_keep_alive=true
+
+# Timeout for client connections' socket operations. If an
+# incoming connection is idle for this number of seconds it
+# will be closed. A value of '0' means wait forever. (integer
+# value)
+#client_socket_timeout=900
+
 
 #
 # Options defined in nova.api.auth
@@ -525,8 +351,12 @@
 # v3 api. (boolean value)
 #api_rate_limit=false
 
-# The strategy to use for auth: noauth or keystone. (string
-# value)
+#  The strategy to use for auth: keystone, noauth
+# (deprecated), or noauth2. Both noauth and noauth2 are
+# designed for testing only, as they do no actual credential
+# checking. noauth provides administrative credentials
+# regardless of the passed in user, noauth2 only does if
+# 'admin' is specified as the username.  (string value)
 #auth_strategy=keystone
 
 # Treat X-Forwarded-For as the canonical remote address. Only
@@ -561,6 +391,9 @@
 # Time in seconds before ec2 timestamp expires (integer value)
 #ec2_timestamp_expiry=300
 
+# Disable SSL certificate verification. (boolean value)
+#keystone_ec2_insecure=false
+
 
 #
 # Options defined in nova.api.ec2.cloud
@@ -581,7 +414,7 @@
 
 # The path prefix used to call the ec2 API server (string
 # value)
-#ec2_path=/services/Cloud
+#ec2_path=/
 
 # List of region=fqdn pairs separated by commas (list value)
 #region_list=
@@ -600,6 +433,19 @@
 
 
 #
+# Options defined in nova.api.metadata.handler
+#
+
+# Time in seconds to cache metadata; 0 to disable metadata
+# caching entirely (not recommended). Increasingthis should
+# improve response times of the metadata API when under heavy
+# load. Higher values may increase memoryusage and result in
+# longer times for host metadata changes to take effect.
+# (integer value)
+#metadata_cache_expiration=15
+
+
+#
 # Options defined in nova.api.metadata.vendordata_json
 #
 
@@ -666,6 +512,10 @@
 # value)
 #neutron_default_tenant_id=default
 
+# Number of private networks allowed per project (integer
+# value)
+#quota_networks=3
+
 
 #
 # Options defined in nova.api.openstack.compute.extensions
@@ -696,15 +546,6 @@
 
 
 #
-# Options defined in nova.api.sizelimit
-#
-
-# The maximum body size per each osapi request(bytes) (integer
-# value)
-#osapi_max_request_body_size=114688
-
-
-#
 # Options defined in nova.cert.rpcapi
 #
 
@@ -807,7 +648,7 @@
 # hostnames. To restore legacy behavior of every instance
 # having the same name, set this option to "%(name)s".  Valid
 # keys for the template are: name, uuid, count. (string value)
-#multi_instance_display_name_template=%(name)s-%(uuid)s
+#multi_instance_display_name_template=%(name)s-%(count)d
 
 # Maximum number of devices that will result in a local image
 # being created on the hypervisor node. Setting this to 0
@@ -861,6 +702,10 @@
 # (integer value)
 #network_allocate_retries=0
 
+# Maximum number of instance builds to run concurrently
+# (integer value)
+#max_concurrent_builds=10
+
 # Number of times to retry block device allocation on failures
 # (integer value)
 #block_device_allocate_retries=60
@@ -871,17 +716,15 @@
 
 # Interval to pull network bandwidth usage info. Not supported
 # on all hypervisors. Set to -1 to disable. Setting this to 0
-# will disable, but this will change in the K release to mean
-# "run at the default rate". (integer value)
+# will run at the default rate. (integer value)
 #bandwidth_poll_interval=600
 
 # Interval to sync power states between the database and the
-# hypervisor. Set to -1 to disable. Setting this to 0 will
-# disable, but this will change in Juno to mean "run at the
-# default rate". (integer value)
+# hypervisor. Set to -1 to disable. Setting this to 0 will run
+# at the default rate. (integer value)
 #sync_power_state_interval=600
 
-# Number of seconds between instance info_cache self healing
+# Number of seconds between instance network information cache
 # updates (integer value)
 #heal_instance_info_cache_interval=60
 
@@ -894,9 +737,8 @@
 #volume_usage_poll_interval=0
 
 # Interval in seconds for polling shelved instances to
-# offload. Set to -1 to disable.Setting this to 0 will
-# disable, but this will change in Juno to mean "run at the
-# default rate". (integer value)
+# offload. Set to -1 to disable.Setting this to 0 will run at
+# the default rate. (integer value)
 #shelved_poll_interval=3600
 
 # Time in seconds before a shelved instance is eligible for
@@ -905,16 +747,24 @@
 #shelved_offload_time=0
 
 # Interval in seconds for retrying failed instance file
-# deletes (integer value)
+# deletes. Set to -1 to disable. Setting this to 0 will run at
+# the default rate. (integer value)
 #instance_delete_interval=300
 
 # Waiting time interval (seconds) between block device
 # allocation retries on failures (integer value)
 #block_device_allocate_retries_interval=3
 
-# Action to take if a running deleted instance is
-# detected.Valid options are 'noop', 'log', 'shutdown', or
-# 'reap'. Set to 'noop' to take no action. (string value)
+# Waiting time interval (seconds) between sending the
+# scheduler a list of current instance UUIDs to verify that
+# its view of instances is in sync with nova. If the CONF
+# option `scheduler_tracks_instance_changes` is False,
+# changing this option will have no effect. (integer value)
+#scheduler_instance_sync_interval=120
+
+# Action to take if a running deleted instance is detected.
+# Valid options are 'noop', 'log', 'shutdown', or 'reap'. Set
+# to 'noop' to take no action. (string value)
 #running_deleted_instance_action=reap
 
 # Number of seconds to wait between runs of the cleanup task.
@@ -932,7 +782,8 @@
 #reboot_timeout=0
 
 # Amount of time in seconds an instance can be in BUILD before
-# going into ERROR status.Set to 0 to disable. (integer value)
+# going into ERROR status. Set to 0 to disable. (integer
+# value)
 #instance_build_timeout=0
 
 # Automatically unrescue an instance after N seconds. Set to 0
@@ -1021,18 +872,6 @@
 
 
 #
-# Options defined in nova.console.vmrc
-#
-
-# DEPRECATED. Port for VMware VMRC connections (integer value)
-#console_vmrc_port=443
-
-# DEPRECATED. Number of retries for retrieving VMRC
-# information (integer value)
-#console_vmrc_error_retries=10
-
-
-#
 # Options defined in nova.console.xvp
 #
 
@@ -1251,7 +1090,7 @@
 # servers. (boolean value)
 #use_network_dns_servers=false
 
-# A list of dmz range that should be accepted (list value)
+# A list of dmz ranges that should be accepted (list value)
 #dmz_cidr=
 
 # Traffic to this range will always be snatted to the fallback
@@ -1291,12 +1130,12 @@
 # The port for the metadata API port (integer value)
 #metadata_port=8775
 
-# Regular expression to match iptables rule that should always
-# be on the top. (string value)
+# Regular expression to match the iptables rule that should
+# always be on the top. (string value)
 #iptables_top_regex=
 
-# Regular expression to match iptables rule that should always
-# be on the bottom. (string value)
+# Regular expression to match the iptables rule that should
+# always be on the bottom. (string value)
 #iptables_bottom_regex=
 
 # The table that iptables to jump to when a packet is to be
@@ -1312,6 +1151,14 @@
 # value)
 #fake_network=false
 
+# Number of times to retry ebtables commands on failure.
+# (integer value)
+#ebtables_exec_attempts=3
+
+# Number of seconds to wait between ebtables retries.
+# (floating point value)
+#ebtables_retry_interval=1.0
+
 
 #
 # Options defined in nova.network.manager
@@ -1450,156 +1297,7 @@
 
 
 #
-# Options defined in nova.openstack.common.eventlet_backdoor
-#
-
-# Enable eventlet backdoor.  Acceptable values are 0, <port>,
-# and <start>:<end>, where 0 results in listening on a random
-# tcp port number; <port> results in listening on the
-# specified port number (and not enabling backdoor if that
-# port is in use); and <start>:<end> results in listening on
-# the smallest unused port number within the specified range
-# of port numbers.  The chosen port is displayed in the
-# service's log file. (string value)
-#backdoor_port=<None>
-
-
-#
-# Options defined in nova.openstack.common.lockutils
-#
-
-# Enables or disables inter-process locks. (boolean value)
-#disable_process_locking=false
-
-# Directory to use for lock files. (string value)
-#lock_path=<None>
-
-
-#
-# Options defined in nova.openstack.common.log
-#
-
-# Print debugging output (set logging level to DEBUG instead
-# of default WARNING level). (boolean value)
-#debug=false
-
-# Print more verbose output (set logging level to INFO instead
-# of default WARNING level). (boolean value)
-#verbose=false
-
-# Log output to standard error. (boolean value)
-#use_stderr=true
-
-# Format string to use for log messages with context. (string
-# value)
-#logging_context_format_string=%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s
-
-# Format string to use for log messages without context.
-# (string value)
-#logging_default_format_string=%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s
-
-# Data to append to log format when level is DEBUG. (string
-# value)
-#logging_debug_format_suffix=%(funcName)s %(pathname)s:%(lineno)d
-
-# Prefix each line of exception output with this format.
-# (string value)
-#logging_exception_prefix=%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s
-
-# List of logger=LEVEL pairs. (list value)
-#default_log_levels=amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,oslo.messaging=INFO,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN,urllib3.connectionpool=WARN,websocket=WARN,keystonemiddleware=WARN,routes.middleware=WARN,stevedore=WARN
-
-# Enables or disables publication of error events. (boolean
-# value)
-#publish_errors=false
-
-# Enables or disables fatal status of deprecations. (boolean
-# value)
-#fatal_deprecations=false
-
-# The format for an instance that is passed with the log
-# message. (string value)
-#instance_format="[instance: %(uuid)s] "
-
-# The format for an instance UUID that is passed with the log
-# message. (string value)
-#instance_uuid_format="[instance: %(uuid)s] "
-
-# The name of a logging configuration file. This file is
-# appended to any existing logging configuration files. For
-# details about logging configuration files, see the Python
-# logging module documentation. (string value)
-# Deprecated group/name - [DEFAULT]/log_config
-#log_config_append=<None>
-
-# DEPRECATED. A logging.Formatter log message format string
-# which may use any of the available logging.LogRecord
-# attributes. This option is deprecated.  Please use
-# logging_context_format_string and
-# logging_default_format_string instead. (string value)
-#log_format=<None>
-
-# Format string for %%(asctime)s in log records. Default:
-# %(default)s . (string value)
-#log_date_format=%Y-%m-%d %H:%M:%S
-
-# (Optional) Name of log file to output to. If no default is
-# set, logging will go to stdout. (string value)
-# Deprecated group/name - [DEFAULT]/logfile
-#log_file=<None>
-
-# (Optional) The base directory used for relative --log-file
-# paths. (string value)
-# Deprecated group/name - [DEFAULT]/logdir
-#log_dir=<None>
-
-# Use syslog for logging. Existing syslog format is DEPRECATED
-# during I, and will change in J to honor RFC5424. (boolean
-# value)
-#use_syslog=false
-
-# (Optional) Enables or disables syslog rfc5424 format for
-# logging. If enabled, prefixes the MSG part of the syslog
-# message with APP-NAME (RFC5424). The format without the APP-
-# NAME is deprecated in I, and will be removed in J. (boolean
-# value)
-#use_syslog_rfc_format=false
-
-# Syslog facility to receive log lines. (string value)
-#syslog_log_facility=LOG_USER
-
-
-#
-# Options defined in nova.openstack.common.memorycache
-#
-
-# Memcached servers or None for in process cache. (list value)
-#memcached_servers=<None>
-
-
-#
-# Options defined in nova.openstack.common.periodic_task
-#
-
-# Some periodic tasks can be run in a separate process. Should
-# we run them here? (boolean value)
-#run_external_periodic_tasks=true
-
-
-#
-# Options defined in nova.openstack.common.policy
-#
-
-# The JSON file that defines policies. (string value)
-#policy_file=policy.json
-
-# Default rule. Enforced when a requested rule is not found.
-# (string value)
-#policy_default_rule=default
-
-
-#
-# Options defined in nova.pci.pci_request
+# Options defined in nova.pci.request
 #
 
 # An alias for a PCI passthrough device requirement. This
@@ -1613,7 +1311,7 @@
 
 
 #
-# Options defined in nova.pci.pci_whitelist
+# Options defined in nova.pci.whitelist
 #
 
 # White list of PCI devices available to VMs. For example:
@@ -1728,8 +1426,8 @@
 
 # Filter classes available to the scheduler which may be
 # specified more than once.  An entry of
-# "nova.scheduler.filters.standard_filters" maps to all
-# filters included with nova. (multi valued)
+# "nova.scheduler.filters.all_filters" maps to all filters
+# included with nova. (multi valued)
 #scheduler_available_filters=nova.scheduler.filters.all_filters
 
 # Which filter class names to use for filtering hosts when not
@@ -1740,6 +1438,10 @@
 # value)
 #scheduler_weight_classes=nova.scheduler.weights.all_weighers
 
+# Determines if the Scheduler tracks changes to instances to
+# help with its filtering decisions. (boolean value)
+#scheduler_tracks_instance_changes=true
+
 
 #
 # Options defined in nova.scheduler.ironic_host_manager
@@ -1796,6 +1498,16 @@
 
 
 #
+# Options defined in nova.scheduler.weights.io_ops
+#
+
+# Multiplier used for weighing host io ops. Negative numbers
+# mean a preference to choose light workload compute hosts.
+# (floating point value)
+#io_ops_weight_multiplier=-1.0
+
+
+#
 # Options defined in nova.scheduler.weights.ram
 #
 
@@ -1821,12 +1533,9 @@
 # (string value)
 #config_drive_format=iso9660
 
-# DEPRECATED (not needed any more):  Where to put temporary
-# files associated with config drive creation (string value)
-#config_drive_tempdir=<None>
-
-# Set to force injection to take place on a config drive (if
-# set, valid options are: always) (string value)
+# Set to "always" to force injection to take place on a config
+# drive. NOTE: The "always" will be deprecated in the Liberty
+# release cycle. (string value)
 #force_config_drive=<None>
 
 # Name and optionally path of the tool used for ISO image
@@ -1919,9 +1628,8 @@
 #
 
 # Number of seconds to wait between runs of the image cache
-# manager. Set to -1 to disable. Setting this to 0 will
-# disable, but this will change in the K release to mean "run
-# at the default rate". (integer value)
+# manager. Set to -1 to disable. Setting this to 0 will run at
+# the default rate. (integer value)
 #image_cache_manager_interval=2400
 
 # Where cached images are stored under $instances_path. This
@@ -2000,169 +1708,142 @@
 #volume_api_class=nova.volume.cinder.API
 
 
-[baremetal]
+[None]
 
 #
-# Options defined in nova.virt.baremetal.db.api
+# Options defined in nova.openstack.common.eventlet_backdoor
 #
 
-# The backend to use for bare-metal database (string value)
-#db_backend=sqlalchemy
+# Enable eventlet backdoor.  Acceptable values are 0, <port>,
+# and <start>:<end>, where 0 results in listening on a random
+# tcp port number; <port> results in listening on the
+# specified port number (and not enabling backdoor if that
+# port is in use); and <start>:<end> results in listening on
+# the smallest unused port number within the specified range
+# of port numbers.  The chosen port is displayed in the
+# service's log file. (string value)
+#backdoor_port=<None>
 
 
 #
-# Options defined in nova.virt.baremetal.db.sqlalchemy.session
+# Options defined in nova.openstack.common.memorycache
 #
 
-# The SQLAlchemy connection string used to connect to the
-# bare-metal database (string value)
-#sql_connection=sqlite:///$state_path/baremetal_nova.sqlite
+# Memcached servers or None for in process cache. (list value)
+#memcached_servers=<None>
 
 
 #
-# Options defined in nova.virt.baremetal.driver
+# Options defined in nova.openstack.common.periodic_task
 #
 
-# Baremetal VIF driver. (string value)
-#vif_driver=nova.virt.baremetal.vif_driver.BareMetalVIFDriver
-
-# Baremetal volume driver. (string value)
-#volume_driver=nova.virt.baremetal.volume_driver.LibvirtVolumeDriver
-
-# A list of additional capabilities corresponding to
-# flavor_extra_specs for this compute host to advertise. Valid
-# entries are name=value, pairs For example, "key1:val1,
-# key2:val2" (list value)
-#flavor_extra_specs=
-
-# Baremetal driver back-end (pxe or tilera) (string value)
-#driver=nova.virt.baremetal.pxe.PXE
-
-# Baremetal power management method (string value)
-#power_manager=nova.virt.baremetal.ipmi.IPMI
-
-# Baremetal compute node's tftp root path (string value)
-#tftp_root=/tftpboot
+# Some periodic tasks can be run in a separate process. Should
+# we run them here? (boolean value)
+#run_external_periodic_tasks=true
 
 
 #
-# Options defined in nova.virt.baremetal.ipmi
+# Options defined in nova.openstack.common.policy
 #
 
-# Path to baremetal terminal program (string value)
-#terminal=shellinaboxd
-
-# Path to baremetal terminal SSL cert(PEM) (string value)
-#terminal_cert_dir=<None>
+# The JSON file that defines policies. (string value)
+#policy_file=policy.json
 
-# Path to directory stores pidfiles of baremetal_terminal
+# Default rule. Enforced when a requested rule is not found.
 # (string value)
-#terminal_pid_dir=$state_path/baremetal/console
+#policy_default_rule=default
 
-# Maximal number of retries for IPMI operations (integer
-# value)
-#ipmi_power_retry=10
+# Directories where policy configuration files are stored.
+# They can be relative to any directory in the search path
+# defined by the config_dir option, or absolute paths. The
+# file defined by policy_file must exist for these directories
+# to be searched.  Missing or empty directories are ignored.
+# (multi valued)
+#policy_dirs=policy.d
 
 
 #
-# Options defined in nova.virt.baremetal.pxe
+# Options defined in nova.openstack.common.versionutils
 #
 
-# Default kernel image ID used in deployment phase (string
+# Enables or disables fatal status of deprecations. (boolean
 # value)
-#deploy_kernel=<None>
+#fatal_deprecations=false
 
-# Default ramdisk image ID used in deployment phase (string
-# value)
-#deploy_ramdisk=<None>
 
-# Template file for injected network config (string value)
-#net_config_template=$pybasedir/nova/virt/baremetal/net-dhcp.ubuntu.template
+[api_database]
 
-# Additional append parameters for baremetal PXE boot (string
-# value)
-#pxe_append_params=nofb nomodeset vga=normal
+#
+# Options defined in nova.db.sqlalchemy.api
+#
 
-# Template file for PXE configuration (string value)
-#pxe_config_template=$pybasedir/nova/virt/baremetal/pxe_config.template
+# The SQLAlchemy connection string to use to connect to the
+# Nova API database. (string value)
+#connection=<None>
 
-# If True, enable file injection for network info, files and
-# admin password (boolean value)
-#use_file_injection=false
+# If True, SQLite uses synchronous mode. (boolean value)
+#sqlite_synchronous=true
 
-# Timeout for PXE deployments. Default: 0 (unlimited) (integer
+# Timeout before idle SQL connections are reaped. (integer
 # value)
-#pxe_deploy_timeout=0
-
-# If set, pass the network configuration details to the
-# initramfs via cmdline. (boolean value)
-#pxe_network_config=false
-
-# This gets passed to Neutron as the bootfile dhcp parameter.
-# (string value)
-#pxe_bootfile_name=pxelinux.0
+#idle_timeout=3600
 
+# Maximum number of SQL connections to keep open in a pool.
+# (integer value)
+#max_pool_size=<None>
 
-#
-# Options defined in nova.virt.baremetal.tilera_pdu
-#
+# Maximum number of database connection retries during
+# startup. Set to -1 to specify an infinite retry count.
+# (integer value)
+#max_retries=10
 
-# IP address of tilera pdu (string value)
-#tile_pdu_ip=10.0.100.1
+# Interval between retries of opening a SQL connection.
+# (integer value)
+#retry_interval=10
 
-# Management script for tilera pdu (string value)
-#tile_pdu_mgr=/tftpboot/pdu_mgr
+# If set, use this value for max_overflow with SQLAlchemy.
+# (integer value)
+#max_overflow=<None>
 
-# Power status of tilera PDU is OFF (integer value)
-#tile_pdu_off=2
+# Verbosity of SQL debugging information: 0=None,
+# 100=Everything. (integer value)
+#connection_debug=0
 
-# Power status of tilera PDU is ON (integer value)
-#tile_pdu_on=1
+# Add Python stack traces to SQL as comment strings. (boolean
+# value)
+#connection_trace=false
 
-# Power status of tilera PDU (integer value)
-#tile_pdu_status=9
+# If set, use this value for pool_timeout with SQLAlchemy.
+# (integer value)
+#pool_timeout=<None>
 
-# Wait time in seconds until check the result after tilera
-# power operations (integer value)
-#tile_power_wait=9
 
+[barbican]
 
 #
-# Options defined in nova.virt.baremetal.virtual_power_driver
+# Options defined in nova.keymgr.barbican
 #
 
-# IP or name to virtual power host (string value)
-#virtual_power_ssh_host=
-
-# Port to use for ssh to virtual power host (integer value)
-#virtual_power_ssh_port=22
-
-# Base command to use for virtual power(vbox, virsh) (string
-# value)
-#virtual_power_type=virsh
-
-# User to execute virtual power commands as (string value)
-#virtual_power_host_user=
+# Info to match when looking for barbican in the service
+# catalog. Format is: separated values of the form:
+# <service_type>:<service_name>:<endpoint_type> (string value)
+#catalog_info=key-manager:barbican:public
 
-# Password for virtual power host_user (string value)
-#virtual_power_host_pass=
+# Override service catalog lookup with template for barbican
+# endpoint e.g. http://localhost:9311/v1/%(project_id)s
+# (string value)
+#endpoint_template=<None>
 
-# The ssh key for virtual power host_user (string value)
-#virtual_power_host_key=<None>
+# Region name of this node (string value)
+#os_region_name=<None>
 
 
 #
-# Options defined in nova.virt.baremetal.volume_driver
+# Options defined in nova.volume.cinder
 #
 
-# Do not set this out of dev/test environments. If a node does
-# not have a fixed PXE IP address, volumes are exported with
-# globally opened ACL (boolean value)
-#use_unsafe_iscsi=false
-
-# The iSCSI IQN prefix used in baremetal volume connections.
-# (string value)
-#iscsi_iqn_prefix=iqn.2010-10.org.openstack.baremetal
+# Region name of this node (string value)
+#os_region_name=<None>
 
 
 [cells]
@@ -2321,41 +2002,19 @@
 # Info to match when looking for cinder in the service
 # catalog. Format is: separated values of the form:
 # <service_type>:<service_name>:<endpoint_type> (string value)
-# Deprecated group/name - [DEFAULT]/cinder_catalog_info
-#catalog_info=volume:cinder:publicURL
+#catalog_info=volumev2:cinderv2:publicURL
 
 # Override service catalog lookup with template for cinder
 # endpoint e.g. http://localhost:8776/v1/%(project_id)s
 # (string value)
-# Deprecated group/name - [DEFAULT]/cinder_endpoint_template
 #endpoint_template=<None>
 
-# Region name of this node (string value)
-# Deprecated group/name - [DEFAULT]/os_region_name
-#os_region_name=<None>
-
-# Location of ca certificates file to use for cinder client
-# requests. (string value)
-# Deprecated group/name - [DEFAULT]/cinder_ca_certificates_file
-#ca_certificates_file=<None>
-
 # Number of cinderclient retries on failed http calls (integer
 # value)
-# Deprecated group/name - [DEFAULT]/cinder_http_retries
 #http_retries=3
 
-# HTTP inactivity timeout (in seconds) (integer value)
-# Deprecated group/name - [DEFAULT]/cinder_http_timeout
-#http_timeout=<None>
-
-# Allow to perform insecure SSL requests to cinder (boolean
-# value)
-# Deprecated group/name - [DEFAULT]/cinder_api_insecure
-#api_insecure=false
-
 # Allow attach between instance and volume in different
 # availability zones. (boolean value)
-# Deprecated group/name - [DEFAULT]/cinder_cross_az_attach
 #cross_az_attach=true
 
 
@@ -2380,6 +2039,24 @@
 #workers=<None>
 
 
+[database]
+
+#
+# Options defined in nova.db.sqlalchemy.api
+#
+
+# The SQLAlchemy connection string to use to connect to the
+# slave database. (string value)
+#slave_connection=<None>
+
+# The SQL mode to be used for MySQL sessions. This option,
+# including the default, overrides any server-set SQL mode. To
+# use whatever SQL mode is set by the server configuration,
+# set this to no value. Example: mysql_sql_mode= (string
+# value)
+#mysql_sql_mode=TRADITIONAL
+
+
 [ephemeral_storage_encryption]
 
 #
@@ -2408,32 +2085,26 @@
 #
 
 # Default glance hostname or IP address (string value)
-# Deprecated group/name - [DEFAULT]/glance_host
 #host=$my_ip
 
 # Default glance port (integer value)
-# Deprecated group/name - [DEFAULT]/glance_port
 #port=9292
 
 # Default protocol to use when connecting to glance. Set to
 # https for SSL. (string value)
-# Deprecated group/name - [DEFAULT]/glance_protocol
 #protocol=http
 
 # A list of the glance api servers available to nova. Prefix
 # with https:// for ssl-based glance api servers.
 # ([hostname|ip]:port) (list value)
-# Deprecated group/name - [DEFAULT]/glance_api_servers
 #api_servers=<None>
 
 # Allow to perform insecure SSL (https) requests to glance
 # (boolean value)
-# Deprecated group/name - [DEFAULT]/glance_api_insecure
 #api_insecure=false
 
-# Number of retries when downloading an image from glance
-# (integer value)
-# Deprecated group/name - [DEFAULT]/glance_num_retries
+# Number of retries when uploading / downloading an image to /
+# from glance. (integer value)
 #num_retries=0
 
 # A list of url scheme that can be downloaded directly via the
@@ -2442,6 +2113,16 @@
 #allowed_direct_url_schemes=
 
 
+[guestfs]
+
+#
+# Options defined in nova.virt.disk.vfs.guestfs
+#
+
+# Enable guestfs debug (boolean value)
+#debug=false
+
+
 [hyperv]
 
 #
@@ -2575,7 +2256,8 @@
 
 # Log level override for ironicclient. Set this in order to
 # override the global "default_log_levels", "verbose", and
-# "debug" settings. (string value)
+# "debug" settings. DEPRECATED: use standard logging
+# configuration. (string value)
 #client_log_level=<None>
 
 # Ironic keystone tenant name. (string value)
@@ -2616,73 +2298,34 @@
 # Options defined in keystonemiddleware.auth_token
 #
 
-# Prefix to prepend at the beginning of the path. Deprecated,
-# use identity_uri. (string value)
-#auth_admin_prefix=
-
-# Host providing the admin Identity API endpoint. Deprecated,
-# use identity_uri. (string value)
-#auth_host=127.0.0.1
-
-# Port of the admin Identity API endpoint. Deprecated, use
-# identity_uri. (integer value)
-#auth_port=35357
-
-# Protocol of the admin Identity API endpoint (http or https).
-# Deprecated, use identity_uri. (string value)
-#auth_protocol=https
-
-# Complete public Identity API endpoint (string value)
+# Complete public Identity API endpoint. (string value)
 #auth_uri=<None>
 
-# Complete admin Identity API endpoint. This should specify
-# the unversioned root endpoint e.g. https://localhost:35357/
-# (string value)
-#identity_uri=<None>
-
-# API version of the admin Identity API endpoint (string
+# API version of the admin Identity API endpoint. (string
 # value)
 #auth_version=<None>
 
 # Do not handle authorization requests within the middleware,
 # but delegate the authorization decision to downstream WSGI
-# components (boolean value)
+# components. (boolean value)
 #delay_auth_decision=false
 
 # Request timeout value for communicating with Identity API
-# server. (boolean value)
+# server. (integer value)
 #http_connect_timeout=<None>
 
 # How many times are we trying to reconnect when communicating
 # with Identity API Server. (integer value)
 #http_request_max_retries=3
 
-# This option is deprecated and may be removed in a future
-# release. Single shared secret with the Keystone
-# configuration used for bootstrapping a Keystone
-# installation, or otherwise bypassing the normal
-# authentication process. This option should not be used, use
-# `admin_user` and `admin_password` instead. (string value)
-#admin_token=<None>
-
-# Keystone account username (string value)
-#admin_user=<None>
-
-# Keystone account password (string value)
-#admin_password=<None>
-
-# Keystone service account tenant name to validate user tokens
-# (string value)
-#admin_tenant_name=admin
-
-# Env key for the swift cache (string value)
+# Env key for the swift cache. (string value)
 #cache=<None>
 
-# Required if Keystone server requires client certificate
+# Required if identity server requires client certificate
 # (string value)
 #certfile=<None>
 
-# Required if Keystone server requires client certificate
+# Required if identity server requires client certificate
 # (string value)
 #keyfile=<None>
 
@@ -2693,7 +2336,7 @@
 # Verify HTTPS connections. (boolean value)
 #insecure=false
 
-# Directory used to cache files related to PKI tokens (string
+# Directory used to cache files related to PKI tokens. (string
 # value)
 #signing_dir=<None>
 
@@ -2716,7 +2359,7 @@
 # value)
 #revocation_cache_time=10
 
-# (optional) if defined, indicate whether token data should be
+# (Optional) If defined, indicate whether token data should be
 # authenticated or authenticated and encrypted. Acceptable
 # values are MAC or ENCRYPT.  If MAC, token data is
 # authenticated (with HMAC) in the cache. If ENCRYPT, token
@@ -2725,38 +2368,38 @@
 # raise an exception on initialization. (string value)
 #memcache_security_strategy=<None>
 
-# (optional, mandatory if memcache_security_strategy is
-# defined) this string is used for key derivation. (string
+# (Optional, mandatory if memcache_security_strategy is
+# defined) This string is used for key derivation. (string
 # value)
 #memcache_secret_key=<None>
 
-# (optional) number of seconds memcached server is considered
+# (Optional) Number of seconds memcached server is considered
 # dead before it is tried again. (integer value)
 #memcache_pool_dead_retry=300
 
-# (optional) max total number of open connections to every
+# (Optional) Maximum total number of open connections to every
 # memcached server. (integer value)
 #memcache_pool_maxsize=10
 
-# (optional) socket timeout in seconds for communicating with
+# (Optional) Socket timeout in seconds for communicating with
 # a memcache server. (integer value)
 #memcache_pool_socket_timeout=3
 
-# (optional) number of seconds a connection to memcached is
+# (Optional) Number of seconds a connection to memcached is
 # held unused in the pool before it is closed. (integer value)
 #memcache_pool_unused_timeout=60
 
-# (optional) number of seconds that an operation will wait to
+# (Optional) Number of seconds that an operation will wait to
 # get a memcache client connection from the pool. (integer
 # value)
 #memcache_pool_conn_get_timeout=10
 
-# (optional) use the advanced (eventlet safe) memcache client
+# (Optional) Use the advanced (eventlet safe) memcache client
 # pool. The advanced pool will only work under python 2.x.
 # (boolean value)
 #memcache_use_advanced_pool=false
 
-# (optional) indicate whether to set the X-Service-Catalog
+# (Optional) Indicate whether to set the X-Service-Catalog
 # header. If False, middleware will not ask for service
 # catalog on token validation and will not set the X-Service-
 # Catalog header. (boolean value)
@@ -2775,7 +2418,7 @@
 
 # If true, the revocation list will be checked for cached
 # tokens. This requires that PKI tokens are configured on the
-# Keystone server. (boolean value)
+# identity server. (boolean value)
 #check_revocations_for_cached=false
 
 # Hash algorithms to use for hashing PKI tokens. This may be a
@@ -2808,7 +2451,7 @@
 #rescue_ramdisk_id=<None>
 
 # Libvirt domain type (valid options are: kvm, lxc, qemu, uml,
-# xen) (string value)
+# xen and parallels) (string value)
 #virt_type=kvm
 
 # Override the default libvirt URI (which is dependent on
@@ -2849,11 +2492,6 @@
 # vdi). Defaults to same as source image (string value)
 #snapshot_image_format=<None>
 
-# DEPRECATED. Libvirt handlers for remote volumes. This option
-# is deprecated and will be removed in the Kilo release. (list
-# value)
-#volume_drivers=iscsi=nova.virt.libvirt.volume.LibvirtISCSIVolumeDriver,iser=nova.virt.libvirt.volume.LibvirtISERVolumeDriver,local=nova.virt.libvirt.volume.LibvirtVolumeDriver,fake=nova.virt.libvirt.volume.LibvirtFakeVolumeDriver,rbd=nova.virt.libvirt.volume.LibvirtNetVolumeDriver,sheepdog=nova.virt.libvirt.volume.LibvirtNetVolumeDriver,nfs=nova.virt.libvirt.volume.LibvirtNFSVolumeDriver,aoe=nova.virt.libvirt.volume.LibvirtAOEVolumeDriver,glusterfs=nova.virt.libvirt.volume.LibvirtGlusterfsVolumeDriver,fibre_channel=nova.virt.libvirt.volume.LibvirtFibreChannelVolumeDriver,scality=nova.virt.libvirt.volume.LibvirtScalityVolumeDriver
-
 # Override the default disk prefix for the devices attached to
 # a server, which is dependent on virt_type. (valid options
 # are: sd, xvd, uvd, vd) (string value)
@@ -2939,14 +2577,6 @@
 # flag is set to True. (boolean value)
 #sparse_logical_volumes=false
 
-# Method used to wipe old volumes (valid options are: none,
-# zero, shred) (string value)
-#volume_clear=zero
-
-# Size in MiB to wipe at start of old volumes. 0 => all
-# (integer value)
-#volume_clear_size=0
-
 # The RADOS pool in which rbd volumes are stored (string
 # value)
 #images_rbd_pool=rbd
@@ -2986,6 +2616,19 @@
 
 
 #
+# Options defined in nova.virt.libvirt.lvm
+#
+
+# Method used to wipe old volumes (valid options are: none,
+# zero, shred) (string value)
+#volume_clear=zero
+
+# Size in MiB to wipe at start of old volumes. 0 => all
+# (integer value)
+#volume_clear_size=0
+
+
+#
 # Options defined in nova.virt.libvirt.utils
 #
 
@@ -3027,10 +2670,19 @@
 # node (string value)
 #nfs_mount_point_base=$state_path/mnt
 
-# Mount options passedf to the NFS client. See section of the
+# Mount options passed to the NFS client. See section of the
 # nfs man page for details (string value)
 #nfs_mount_options=<None>
 
+# Directory where the SMBFS shares are mounted on the compute
+# node (string value)
+#smbfs_mount_point_base=$state_path/mnt
+
+# Mount options passed to the SMBFS client. See mount.cifs man
+# page for details. Note that the libvirt-qemu uid and gid
+# must be specified. (string value)
+#smbfs_mount_options=
+
 # Number of times to rediscover AoE target to find volume
 # (integer value)
 #num_aoe_discover_tries=3
@@ -3056,32 +2708,20 @@
 # Currently supported protocols: [gluster] (list value)
 #qemu_allowed_storage_drivers=
 
+# Directory where the Quobyte volume is mounted on the compute
+# node (string value)
+#quobyte_mount_point_base=$state_path/mnt
 
-[matchmaker_redis]
-
-#
-# Options defined in oslo.messaging
-#
-
-# Host to locate redis. (string value)
-#host=127.0.0.1
-
-# Use this port to connect to redis host. (integer value)
-#port=6379
-
-# Password for Redis server (optional). (string value)
-#password=<None>
-
-
-[matchmaker_ring]
-
-#
-# Options defined in oslo.messaging
-#
+# Path to a Quobyte Client configuration file. (string value)
+#quobyte_client_cfg=<None>
 
-# Matchmaker ring file (JSON). (string value)
-# Deprecated group/name - [DEFAULT]/matchmaker_ringfile
-#ringfile=/etc/oslo/matchmaker_ring.json
+# The iSCSI transport iface to use to connect to target in
+# case offload support is desired. Supported transports are
+# be2iscsi, bnx2i, cxgb3i, cxgb4i, qla4xxx and ocs. Default
+# format is transport_name.hwaddress and can be generated
+# manually or via iscsiadm -m iface (string value)
+# Deprecated group/name - [DEFAULT]/iscsi_transport
+#iscsi_iface=<None>
 
 
 [metrics]
@@ -3125,12 +2765,10 @@
 
 # Set flag to indicate Neutron will proxy metadata requests
 # and resolve instance ids. (boolean value)
-# Deprecated group/name - [DEFAULT]/service_neutron_metadata_proxy
 #service_metadata_proxy=false
 
 # Shared secret to validate proxies Neutron metadata requests
 # (string value)
-# Deprecated group/name - [DEFAULT]/neutron_metadata_proxy_shared_secret
 #metadata_proxy_shared_secret=
 
 
@@ -3139,76 +2777,64 @@
 #
 
 # URL for connecting to neutron (string value)
-# Deprecated group/name - [DEFAULT]/neutron_url
 #url=http://127.0.0.1:9696
 
-# Timeout value for connecting to neutron in seconds (integer
-# value)
-# Deprecated group/name - [DEFAULT]/neutron_url_timeout
-#url_timeout=30
-
-# User id for connecting to neutron in admin context (string
-# value)
+# User id for connecting to neutron in admin context.
+# DEPRECATED: specify an auth_plugin and appropriate
+# credentials instead. (string value)
 #admin_user_id=<None>
 
-# Username for connecting to neutron in admin context (string
-# value)
-# Deprecated group/name - [DEFAULT]/neutron_admin_username
+# Username for connecting to neutron in admin context
+# DEPRECATED: specify an auth_plugin and appropriate
+# credentials instead. (string value)
 #admin_username=<None>
 
-# Password for connecting to neutron in admin context (string
-# value)
-# Deprecated group/name - [DEFAULT]/neutron_admin_password
+# Password for connecting to neutron in admin context
+# DEPRECATED: specify an auth_plugin and appropriate
+# credentials instead. (string value)
 #admin_password=<None>
 
-# Tenant id for connecting to neutron in admin context (string
-# value)
-# Deprecated group/name - [DEFAULT]/neutron_admin_tenant_id
+# Tenant id for connecting to neutron in admin context
+# DEPRECATED: specify an auth_plugin and appropriate
+# credentials instead. (string value)
 #admin_tenant_id=<None>
 
 # Tenant name for connecting to neutron in admin context. This
 # option will be ignored if neutron_admin_tenant_id is set.
 # Note that with Keystone V3 tenant names are only unique
-# within a domain. (string value)
-# Deprecated group/name - [DEFAULT]/neutron_admin_tenant_name
+# within a domain. DEPRECATED: specify an auth_plugin and
+# appropriate credentials instead. (string value)
 #admin_tenant_name=<None>
 
 # Region name for connecting to neutron in admin context
 # (string value)
-# Deprecated group/name - [DEFAULT]/neutron_region_name
 #region_name=<None>
 
-# Authorization URL for connecting to neutron in admin context
-# (string value)
-# Deprecated group/name - [DEFAULT]/neutron_admin_auth_url
+# Authorization URL for connecting to neutron in admin
+# context. DEPRECATED: specify an auth_plugin and appropriate
+# credentials instead. (string value)
 #admin_auth_url=http://localhost:5000/v2.0
 
-# If set, ignore any SSL validation issues (boolean value)
-# Deprecated group/name - [DEFAULT]/neutron_api_insecure
-#api_insecure=false
-
 # Authorization strategy for connecting to neutron in admin
-# context (string value)
-# Deprecated group/name - [DEFAULT]/neutron_auth_strategy
+# context. DEPRECATED: specify an auth_plugin and appropriate
+# credentials instead. If an auth_plugin is specified strategy
+# will be ignored. (string value)
 #auth_strategy=keystone
 
 # Name of Integration Bridge used by Open vSwitch (string
 # value)
-# Deprecated group/name - [DEFAULT]/neutron_ovs_bridge
 #ovs_bridge=br-int
 
 # Number of seconds before querying neutron for extensions
 # (integer value)
-# Deprecated group/name - [DEFAULT]/neutron_extension_sync_interval
 #extension_sync_interval=600
 
-# Location of CA certificates file to use for neutron client
-# requests. (string value)
-# Deprecated group/name - [DEFAULT]/neutron_ca_certificates_file
-#ca_certificates_file=<None>
-
-# Allow an instance to have multiple vNICs attached to the
-# same Neutron network. (boolean value)
+# DEPRECATED: Allow an instance to have multiple vNICs
+# attached to the same Neutron network. This option is
+# deprecated in the 2015.1 release and will be removed in the
+# 2015.2 release where the default behavior will be to always
+# allow multiple ports from the same network to be attached to
+# an instance. (boolean value)
 #allow_duplicate_networks=false
 
 
@@ -3289,12 +2915,10 @@
 #
 
 # Host on which to listen for incoming requests (string value)
-# Deprecated group/name - [DEFAULT]/spicehtml5proxy_host
 #html5proxy_host=0.0.0.0
 
 # Port on which to listen for incoming requests (integer
 # value)
-# Deprecated group/name - [DEFAULT]/spicehtml5proxy_port
 #html5proxy_port=6082
 
 
@@ -3473,6 +3097,20 @@
 # Options defined in nova.virt.vmwareapi.driver
 #
 
+# The PBM status. (boolean value)
+#pbm_enabled=false
+
+# PBM service WSDL file location URL. e.g.
+# file:///opt/SDK/spbm/wsdl/pbmService.wsdl Not setting this
+# will disable storage policy based placement of instances.
+# (string value)
+#pbm_wsdl_location=<None>
+
+# The PBM default policy. If pbm_wsdl_location is set and
+# there is no defined storage policy for the specific request
+# then this policy will be used. (string value)
+#pbm_default_policy=<None>
+
 # Hostname or IP address for connection to VMware VC host.
 # (string value)
 #host_ip=<None>
@@ -3541,6 +3179,42 @@
 #maximum_objects=100
 
 
+#
+# Options defined in nova.virt.vmwareapi.vmops
+#
+
+# The prefix for Where cached images are stored. This is NOT
+# the full path - just a folder prefix. This should only be
+# used when a datastore cache should be shared between compute
+# nodes. Note: this should only be used when the compute nodes
+# have a shared file system. (string value)
+#cache_prefix=<None>
+
+
+[workarounds]
+
+#
+# Options defined in nova.utils
+#
+
+# This option allows a fallback to sudo for performance
+# reasons. For example see
+# https://bugs.launchpad.net/nova/+bug/1415106 (boolean value)
+#disable_rootwrap=false
+
+# When using libvirt 1.2.2 fails live snapshots intermittently
+# under load.  This config option provides mechanism to
+# disable livesnapshot while this is resolved.  See
+# https://bugs.launchpad.net/nova/+bug/1334398 (boolean value)
+#disable_libvirt_livesnapshot=true
+
+# Whether to destroy instances on startup when we suspect they
+# have previously been evacuated. This can result in data loss
+# if undesired. See https://launchpad.net/bugs/1419785
+# (boolean value)
+#destroy_after_evacuate=true
+
+
 [xenserver]
 
 #
@@ -3736,7 +3410,8 @@
 # rsynced (boolean value)
 #sparse_copy=true
 
-# Maximum number of retries to unplug VBD (integer value)
+# Maximum number of retries to unplug VBD. if <=0, should try
+# once and no retry (integer value)
 #num_vbd_unplug_retries=10
 
 # Whether or not to download images via Bit Torrent
diff --git a/openstack-nova.spec b/openstack-nova.spec
index 2741e78..2b446ef 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -1,22 +1,20 @@
 %global with_doc %{!?_without_doc:1}%{?_without_doc:0}
 %global with_trans %{!?_without_trans:1}%{?_without_trans:0}
 
-%global release_name juno
 %global release_name kilo
-%global milestone .0rc2
 %global service nova
 
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
 
 Name:             openstack-nova
-Version:          2015.1
-Release:          0.1%{?milestone}%{?dist}
+Version:          2015.1.0
+Release:          1%{?milestone}%{?dist}
 Summary:          OpenStack Compute (nova)
 
 Group:            Applications/System
 License:          ASL 2.0
 URL:              http://openstack.org/projects/compute/
-Source0:          http://launchpad.net/%{service}/%{release_name}/%{release_name}-rc2/+download/%{service}-%{upstream_version}.tar.gz
+Source0:          http://launchpad.net/%{service}/%{release_name}/%{version}/+download/%{service}-%{upstream_version}.tar.gz
 
 
 Source1:          nova-dist.conf
@@ -800,485 +798,5 @@ exit 0
 %endif
 
 %changelog
-* Wed Mar 11 2015 Pádraig Brady <pbrady at redhat.com> - 2014.2.2-2
-- remove world-readable bit from /var/log/nova
-
-* Wed Feb 11 2015 Alan Pevec <alan.pevec at redhat.com> 2014.2.2-1
-- Update to upstream 2014.2.2
-
-* Tue Dec 09 2014 Pádraig Brady <pbrady at redhat.com> - 2014.2.1-1
-- Update to upstream 2014.2.1 release
-
-* Fri Oct 24 2014 Pádraig Brady <pbrady at redhat.com> - 2014.2-2
-- Fix openstack-nova-serialproxy.service to call correct binary
-
-* Mon Oct 20 2014 Alan Pevec <alan.pevec at redhat.com> 2014.2-1
-- Juno release
-
-* Mon Oct 20 2014 Pádraig Brady <pbrady at redhat.com> - 2014.2-0.8.rc2
-- Split spicehtml5proxy to subpackage and use standard package service control
-- Add novncproxy service to standard %%post package operation
-- Add new Juno serialproxy service
-
-* Sat Oct 11 2014 Alan Pevec <alan.pevec at redhat.com> 2014.2-0.7.rc2
-- Update to upstream 2014.2.rc2
-
-* Fri Oct 10 2014 Pádraig Brady <pbrady at redhat.com> - 2014.2-0.6rc1
-- Ensure all services are restarted on upgrade
-
-* Wed Oct 01 2014 Alan Pevec <alan.pevec at redhat.com> 2014.2-0.5rc1
-- Update to upstream 2014.2.rc1
-
-* Wed Sep 10 2014 Alan Pevec <apevec at redhat.com> 2014.2-0.3.b3
-- Update to Juno-3 milestone
-
-* Thu Aug 28 2014 Alan Pevec <apevec at redhat.com> 2014.2-0.2.b2
-- use keystonemiddleware
-- fix nova-api startup issue
-
-* Sun Aug 03 2014  Vladan Popovic <vpopovic at redhat.com> 2014.2-0.1.b2
-- Update to upstream 2014.2.b2
-- openstack-nova-compute should depend on libvirt-daemon-kvm, not libvirt - rhbz#996715
-- Use keystoneclient.middleware instead of keystonemiddleware
-
-* Thu Jun 26 2014 Vladan Popovic <vpopovic at redhat.com> 2014.1.1-2
-- Fixes rbd backend image size - rhbz#1112871
-
-* Fri Jun 13 2014 Nikola Đipanov <ndipanov at redhat.com> 2014.1.1-1
-- Update to latest stable/icehouse 2014.1.1 release
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2014.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Thu Apr 17 2014 Vladan Popovic <vpopovic at redhat.com> 2014.1-0.16
-- Update to upstream 2014.1
-
-* Fri Apr 11 2014 Vladan Popovic <vpopovic at redhat.com> 2014.1-0.15.rc2
-- Update to upstream 2014.1.rc2
-
-* Tue Apr 01 2014 Vladan Popovic <vpopovic at redhat.com> 2014.1-0.14.rc1
-- Update to upstream 2014.1.rc1
-- Introduce new systemd-rpm macros in openstack-nova spec file - rhbz#850252
-- Fix double logging when using syslog - rhbz#966050
-
-* Wed Mar 19 2014 Vladan Popovic <vpopovic at redhat.com> - 2014.1-0.13.b3
-- Update python.oslo.messaging requirement to 1.3.0-0.1.a4 - rhbz#1077860
-
-* Fri Mar 07 2014 Vladan Popovic <vpopovic at redhat.com> - 2014.1-0.12.b3
-- Update to Icehouse milestone 3
-
-* Mon Feb 03 2014 Pádraig Brady <pbrady at redhat.com> - 2014.1-0.11.b2
-- Avoid commented [DEFAULT] config issue in nova.conf
-
-* Wed Jan 29 2014 Xavier Queralt <xqueralt at redhat.com> - 2014.1-0.10.b2
-- Remove unneeded requirement on vconfig
-
-* Wed Jan 29 2014 Xavier Queralt <xqueralt at redhat.com> - 2014.1-0.9.b2
-- Add build requirement on python-six
-
-* Mon Jan 27 2014 Xavier Queralt <xqueralt at redhat.com> - 2014.1-0.8.b2
-- Fix the patch for CVE-2013-7130 which was not backported properly
-
-* Fri Jan 24 2014 Xavier Queralt <xqueralt at redhat.com> - 2014.1-0.7.b2
-- Restore pbr patch dropped in the last version by mistake
-
-* Fri Jan 24 2014 Xavier Queralt <xqueralt at redhat.com> - 2014.1-0.6.b2
-- Update to Icehouse milestone 2
-- Require python-keystoneclient for api-paste - rhbz#909113
-- Fix root disk leak in live migration - CVE-2013-7130
-
-* Mon Jan 06 2014 Pádraig Brady <pbrady at redhat.com> - 2014.1-0.5.b1
-- Avoid [keystone_authtoken] config corruption in nova.conf
-
-* Mon Jan 06 2014 Pádraig Brady <pbrady at redhat.com> - 2014.1-0.4.b1
-- Set python-six min version to ensure updated
-
-* Tue Dec 17 2013 Pádraig Brady <pbrady at redhat.com> - 2014.1-0.3.b1
-- Rotate log files by size rather than by age - rhbz#867747
-
-* Mon Dec 16 2013 Xavier Queralt <xqueralt at redhat.com> - 2014.1-0.2.b1
-- Add python-oslo-sphinx to build requirements
-
-* Mon Dec 16 2013 Xavier Queralt <xqueralt at redhat.com> - 2014.1-0.1.b1
-- Update to Icehouse milestone 1
-
-* Tue Dec 03 2013 Xavier Queralt <xqueralt at redhat.com> - 2013.2-4
-- Fix the CVE number references from the latest change
-
-* Mon Nov 18 2013 Xavier Queralt <xqueralt at redhat.com> - 2013.2-3
-- Remove cert and scheduler hard dependency on cinderclient - rhbz#1031679
-- Require ipmitool for baremetal driver - rhbz#1022243
-- Ensure we don't boot oversized images (CVE-2013-4463 and CVE-2013-2096)
-
-* Wed Oct 23 2013 Xavier Queralt <xqueralt at redhat.com> - 2013.2-2
-- Depend on python-oslo-config >= 1:1.2.0 so it gets upgraded automatically - rhbz#1014835
-- remove signing_dir from nova-dist.conf to use the default - rhbz#957485
-- Require bridge-utils on nova-compute package - rhbz#1009065
-
-* Thu Oct 17 2013 Xavier Queralt <xqueralt at redhat.com> - 2013.2-1
-- Update to Havana final
-
-* Tue Oct 15 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.2-0.26.rc2
-- Update to Havana rc1
-
-* Thu Oct 03 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.2-0.23.rc1
-- Update to Havana rc1
-
-* Thu Sep 12 2013 Pádraig Brady <pbrady at redhat.com> - 2013.2-0.20.b3
-- Depend on genisoimage to support creating guest config drives
-
-* Mon Sep 09 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.2-0.19.b3
-- Fix compute_node_get_all() for Nova Baremetal
-
-* Mon Sep 09 2013 Pádraig Brady <pbrady at redhat.com> - 2013.2-0.18.b3
-- Avoid deprecated options in distribution config files
-
-* Mon Sep 09 2013 Dan Prince <dprince at redhat.com> - 2013.2-0.17.b3
-- Add dependency on python-babel
-- Add dependency on python-jinja2
-
-* Mon Sep 09 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.2-0.16.b3
-- Update to Havana milestone 3
-
-* Tue Aug 27 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.2-0.15.b2
-- Fix the tarball download link (SOURCE0)
-
-* Tue Aug 27 2013 Xavier Queralt <xqueralt at redhat.com> - 2013.2-0.14.b2
-- Set auth_version=v2.0 in nova-dist.conf to avoid http://pad.lv/1154809
-
-* Tue Aug 27 2013 Xavier Queralt <xqueralt at redhat.com> - 2013.2-0.13.b2
-- Remove Folsom release deprecated config options from nova-dist.conf
-
-* Tue Aug 27 2013 Xavier Queralt <xqueralt at redhat.com> - 2013.2-0.12.b2
-- Add the second dhcpbridge-flagfile to nova-dist.conf 
-
-* Tue Aug 27 2013 Xavier Queralt <xqueralt at redhat.com> - 2013.2-0.11.b2
-- Change the default config to poll for DB connection indefinitely
-
-* Wed Aug 07 2013 Xavier Queralt <xqueralt at redhat.com> - 2013.2-0.10.b2
-- Create a nova-dist.conf file with default values under /usr/share
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2013.2-0.9.b2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Mon Jul 22 2013 Pádraig Brady <pbrady at redhat.com> - 2013.2-0.8.b2
-- Update to Havana milestone 2
-
-* Mon Jun 24 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.2-0.6.b1
-- Add the novncproxy subpackage (moved from the novnc package)
-
-* Mon Jun 24 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.2-0.4.h1
-- Remove requirements file to be more flexible with dep versions
-
-* Fri Jun 14 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.2-0.3.h1
-- Fix an issue with the version string
-
-* Mon Jun 10 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.2-0.2.h1
-- Add a runtime dep on python-six
-- Fix verision reporting
-
-* Fri Jun 07 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.2-0.1.h1
-- Update to Havana milestone 1
-- Add a build-time dep on python-d2to1
-- Add a build-time dep on python-pbr
-
-* Fri May 17 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.1-2
-- Check QCOW2 image size during root disk creation (CVE-2013-2096)
-
-* Mon May 13 2013 Pádraig Brady <pbrady at redhat.com> - 2013.1.1-1
-- Update to stable/grizzly 2013.1.1 release
-
-* Fri May 10 2013 Pádraig Brady <pbrady at redhat.com> - 2013.1-3
-- Make openstack-nova-network depend on ebtables #961567
-
-* Thu Apr 11 2013 Pádraig Brady <pbrady at redhat.com> - 2013.1-2
-- Fix nova network dnsmasq invocation failure #951144
-
-* Mon Apr 08 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.1-1
-- Update to Grizzly final
-
-* Tue Apr 02 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.1-0.12.rc2
-- Update to Grizzly rc2
-
-* Fri Mar 22 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.1-0.11.rc1
-- Update to Grizzly rc1
-
-* Wed Mar 20 2013 Pádraig Brady - 2013.1-0.10.g3
-- Remove /etc/tgt/conf.d/nova.conf which was invalid for grizzly
-
-* Tue Mar 12 2013 Pádraig Brady - 2013.1-0.9.g3
-- Allow openstack-nova-doc to be installed in isolation
-
-* Thu Feb 28 2013 Dan Prince <dprince at redhat.com> - 2013.1-0.8.g3
-- Use LIBGUESTFS_ATTACH_METHOD=appliance to allow injection to work
-
-* Tue Feb 26 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.1-0.7.g3
-- Fix dependency issues caused by the Milestone 3 update
-
-* Mon Feb 25 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.1-0.6.g3
-- Update to Grizzly milestone 3
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2013.1-0.5.g2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Fri Jan 11 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.1-0.4.g2
-- Update to Grizzly milestone 2
-- Add the version info file
-- Add python-stevedore dependency
-- Add the cells subpackage and service file
-
-* Thu Dec 06 2012 Nikola Đipanov <ndipanov at redhat.com> - 2013.1-0.3.g1
-- signing_dir renamed from incorrect signing_dirname in default nova.conf
-
-* Thu Nov 29 2012 Nikola Đipanov <ndipanov at redhat.com> 2013.1-0.2.g1
--Fix a few spec file issues introduced by the Grizzly update
-
-* Wed Nov 28 2012 Nikola Đipanov <ndipanov at redhat.com> 2013.1-0.1.g1
-- Update to Grizzly milestone 1
-- Remove volume subpackage - removed from Grizzly
-- Add the conductor subpackage - new service added in Grizzly
-- Depend on python-libguestfs instead of libguestfs-mount
-- Don't add the nova user to the group fuse
-- Removes openstack-utils from requirements for nova-common
-
-* Thu Sep 27 2012 Pádraig Brady <pbrady at redhat.com> - 2012.2-1
-- Update to folsom final
-
-* Wed Sep 26 2012 Pádraig Brady <pbrady at redhat.com> - 2012.2-0.11.rc1
-- Support newer polkit config format to allow communication with libvirtd
-- Fix to ensure that tgt configuration is honored
-
-* Fri Sep 21 2012 Pádraig Brady <pbrady at redhat.com> - 2012.2-0.8.rc1
-- Update to folsom rc1
-
-* Mon Sep 17 2012 Alan Pevec <apevec at redhat.com> - 2012.2-0.7.f3
-- Remove user config from paste ini files
-
-* Mon Aug 27 2012 Pádraig Brady <P at draigBrady.com> - 2012.2-0.6.f3
-- Update to folsom milestone 3
-
-* Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2012.2-0.4.f1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jun 08 2012 Pádraig Brady <P at draigBrady.com> - 2012.2-0.3.f1
-- Enable libguestfs image inspection
-
-* Wed Jun 06 2012 Pádraig Brady <P at draigBrady.com> - 2012.2-0.2.f1
-- Fix up protocol case handling for security groups (CVE-2012-2654)
-
-* Tue May 29 2012 Pádraig Brady <P at draigBrady.com> - 2012.2-0.1.f1
-- Update to folsom milestone 1
-
-* Wed May 16 2012 Alan Pevec <apevec at redhat.com> - 2012.1-6
-- Remove m2crypto and other dependencies no loner needed by Essex
-
-* Wed May 16 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-5
-- Sync up with Essex stable branch
-- Handle updated qemu-img info output
-- Remove redundant and outdated openstack-nova-db-setup
-
-* Wed May 09 2012 Alan Pevec <apevec at redhat.com> - 2012.1-4
-- Remove the socat dependency no longer needed by Essex
-
-* Fri Apr 27 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-3
-- Reference new Essex services at installation
-
-* Wed Apr 18 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-2
-- Sync up with Essex stable branch
-- Support more flexible guest image file injection
-- Enforce quota on security group rules (#814275, CVE-2012-2101)
-- Provide startup scripts for the Essex VNC services
-- Provide a startup script for the separated metadata api service
-
-* Sun Apr  8 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-1
-- Update to Essex release
-
-* Thu Mar 29 2012 Russell Bryant <rbryant at redhat.com> 2012.1-0.10.rc1
-- Remove the outdated nova-debug tool
-- CVE-2012-1585 openstack-nova: Long server names grow nova-api log files significantly
-
-* Mon Mar 26 2012 Mark McLoughlin <markmc at redhat.com> - 2012.1-0.9.rc1
-- Avoid killing dnsmasq on network service shutdown (#805947)
-
-* Tue Mar 20 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-0.8.rc1
-- Update to Essex release candidate 1
-
-* Fri Mar 16 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-0.8.e4
-- Include an upstream fix for errors logged when syncing power states
-- Support non blocking libvirt operations
-- Fix an exception when querying a server through the API (#803905)
-- Suppress deprecation warnings with db sync at install (#801302)
-- Avoid and cater for missing libvirt instance images (#801791)
-
-* Tue Mar  6 2012 Alan Pevec <apevec at redhat.com> - 2012.1-0.7.e4
-- Fixup permissions on nova config files
-
-* Tue Mar  6 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-0.6.e4
-- Depend on bridge-utils
-- Support fully transparent handling of the new ini config file
-
-* Fri Mar  2 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-0.5.e4
-- Update to Essex milestone 4.
-- explicitly select the libvirt firewall driver in default nova.conf.
-- Add dependency on python-iso8601.
-- Enable --force_dhcp_release.
-- Switch to the new ini format config file.
-
-* Mon Feb 13 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-0.4.e3
-- Support --force_dhcp_release (#788485)
-
-* Thu Feb  2 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-0.3.e3
-- Suppress a warning from `nova-manage image convert`
-- Add the openstack-nova-cert service which now handles the CA folder
-- Change the default message broker from rabbitmq to qpid
-- Enable the new rootwrap helper, to minimize sudo config
-
-* Fri Jan 27 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-0.2.e3
-- Suppress erroneous output to stdout on package install (#785115)
-- Specify a connection_type in nova.conf, needed by essex-3
-- Depend on python-carrot, currently needed by essex-3
-- Remove the rabbitmq-server dependency as it's now optional
-- Have python-nova depend on the messaging libs, not openstack-nova
-
-* Thu Jan 26 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-0.1.e3
-- Update to essex milestone 3
-
-* Mon Jan 23 2012 Pádraig Brady <P at draigBrady.com> - 2011.3.1-2
-- Fix a REST API v1.0 bug causing a regression with deltacloud
-
-* Fri Jan 20 2012 Pádraig Brady <P at draigBrady.com> - 2011.3.1-1
-- Update to 2011.3.1 release
-- Allow empty mysql root password in mysql setup script
-- Enable mysqld at boot in mysql setup script
-
-* Wed Jan 18 2012 Mark McLoughlin <markmc at redhat.com> - 2011.3.1-0.4.10818%{?dist}
-- Update to latest 2011.3.1 release candidate
-- Re-add nova-{clear-rabbit-queues,instance-usage-audit}
-
-* Tue Jan 17 2012 Mark McLoughlin <markmc at redhat.com> - 2011.3.1-0.3.10814
-- nova-stack isn't missing after all
-
-* Tue Jan 17 2012 Mark McLoughlin <markmc at redhat.com> - 2011.3.1-0.2.10814
-- nova-{stack,clear-rabbit-queues,instance-usage-audit} temporarily removed because of lp#917676
-
-* Tue Jan 17 2012 Mark McLoughlin <markmc at redhat.com> - 2011.3.1-0.1.10814
-- Update to 2011.3.1 release candidate
-- Only adds 4 patches from upstream which we didn't already have
-
-* Wed Jan 11 2012 Pádraig Brady <P at draigBrady.com> - 2011.3-19
-- Fix libguestfs support for specified partitions
-- Fix tenant bypass by authenticated users using API (#772202, CVE-2012-0030)
-
-* Fri Jan  6 2012 Mark McLoughlin <markmc at redhat.com> - 2011.3-18
-- Fix up recent patches which don't apply
-
-* Fri Jan  6 2012 Mark McLoughlin <markmc at redhat.com> - 2011.3-17
-- Backport tgtadm off-by-one fix from upstream (#752709)
-
-* Fri Jan  6 2012 Mark McLoughlin <markmc at redhat.com> - 2011.3-16
-- Rebase to latest upstream stable/diablo, pulling in ~50 patches
-
-* Fri Jan  6 2012 Mark McLoughlin <markmc at redhat.com> - 2011.3-15
-- Move recent patches into git (no functional changes)
-
-* Fri Dec 30 2011 Pádraig Brady <P at draigBrady.com> - 2011.3-14
-- Don't require the fuse group (#770927)
-- Require the fuse package (to avoid #767852)
-
-* Wed Dec 14 2011 Pádraig Brady <P at draigBrady.com> - 2011.3-13
-- Sanitize EC2 manifests and image tarballs (#767236, CVE 2011-4596)
-- update libguestfs support
-
-* Tue Dec 06 2011 Russell Bryant <rbryant at redhat.com> - 2011.3-11
-- Add --yes, --rootpw, and --novapw options to openstack-nova-db-setup.
-
-* Wed Nov 30 2011 Pádraig Brady <P at draigBrady.com> - 2011.3-10
-- Add libguestfs support
-
-* Tue Nov 29 2011 Pádraig Brady <P at draigBrady.com> - 2011.3-9
-- Update the libvirt dependency from 0.8.2 to 0.8.7
-- Ensure we don't access the net when building docs
-
-* Tue Nov 29 2011 Russell Bryant <rbryant at redhat.com> - 2011.3-8
-- Change default database to mysql. (#735012)
-
-* Mon Nov 14 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-7
-- Add ~20 significant fixes from upstream stable branch
-
-* Wed Oct 26 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-6
-- Fix password leak in EC2 API (#749385, CVE 2011-4076)
-
-* Mon Oct 24 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-5
-- Fix block migration (#741690)
-
-* Mon Oct 17 2011 Bob Kukura <rkukura at redhat.com> - 2011.3-4
-- Add dependency on python-amqplib (#746685)
-
-* Wed Sep 28 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-3
-- Fix lazy load exception with security groups (#741307)
-- Fix issue with nova-network deleting the default route (#741686)
-- Fix errors caused by MySQL connection pooling (#741312)
-
-* Mon Sep 26 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-2
-- Manage the package's patches in git; no functional changes.
-
-* Thu Sep 22 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-1
-- Update to Diablo final.
-- Drop some upstreamed patches.
-- Update the metadata-accept patch to what's proposed for essex.
-- Switch rpc impl from carrot to kombu.
-
-* Mon Sep 19 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-0.10.d4
-- Use tgtadm instead of ietadm (#737046)
-
-* Wed Sep 14 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-0.9.d4
-- Remove python-libguestfs dependency (#738187)
-
-* Mon Sep  5 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-0.8.d4
-- Add iptables rule to allow EC2 metadata requests (#734347)
-
-* Sat Sep  3 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-0.7.d4
-- Add iptables rules to allow requests to dnsmasq (#734347)
-
-* Wed Aug 31 2011 Angus Salkeld <asalkeld at redhat.com> - 2011.3-0.6.d4
-- Add the one man page provided by nova.
-- Start services with --flagfile rather than --flag-file (#735070)
-
-* Tue Aug 30 2011 Angus Salkeld <asalkeld at redhat.com> - 2011.3-0.5.d4
-- Switch from SysV init scripts to systemd units (#734345)
-
-* Mon Aug 29 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-0.4.d4
-- Don't generate root CA during %%post (#707199)
-- The nobody group shouldn't own files in /var/lib/nova
-- Add workaround for sphinx-build segfault
-
-* Fri Aug 26 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-0.3.d4
-- Update to diablo-4 milestone
-- Use statically assigned uid:gid 162:162 (#732442)
-- Collapse all sub-packages into openstack-nova; w/o upgrade path
-- Reduce use of macros
-- Rename stack to nova-stack
-- Fix openssl.cnf.tmpl script-without-shebang rpmlint warning
-- Really remove ajaxterm
-- Mark polkit file as %%config
-
-* Mon Aug 22 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-0.2.1449bzr
-- Remove dependency on python-novaclient
-
-* Wed Aug 17 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-0.1.1449bzr
-- Update to latest upstream.
-- nova-import-canonical-imagestore has been removed
-- nova-clear-rabbit-queues was added
-
-* Tue Aug  9 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-0.2.1409bzr
-- Update to newer upstream
-- nova-instancemonitor has been removed
-- nova-instance-usage-audit added
-
-* Tue Aug  9 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-0.1.bzr1130
-- More cleanups
-- Change release tag to reflect pre-release status
-
-* Wed Jun 29 2011 Matt Domsch <mdomsch at fedoraproject.org> - 2011.3-1087.1
-- Initial package from Alexander Sakhnov <asakhnov at mirantis.com>
-  with cleanups by Matt Domsch
+* Thu Apr 30 2015 Alan Pevec <alan.pevec at redhat.com> 2015.1.0-1
+- OpenStack Kilo release
diff --git a/sources b/sources
index 4c1431c..e33286d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b442a319a7d965daeb82fd813e74886c  nova-2015.1.0rc2.tar.gz
+a60450bbf1ea0f124c0605a1bd7c718c  nova-2015.1.0.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/openstack-nova.git/commit/?h=master&id=8945622d349ef552dbc182f60485f6807d7c8708