diff -Nru openstack-trove-5.1.0/AUTHORS openstack-trove-5.1.1/AUTHORS --- openstack-trove-5.1.0/AUTHORS 2016-07-15 15:45:56.000000000 +0000 +++ openstack-trove-5.1.1/AUTHORS 2016-09-06 19:31:49.000000000 +0000 @@ -4,6 +4,7 @@ Alex Tomic Alexander Ignatov Amrith Kumar +Andreas Jaeger Andreas Jaeger Andrew Bramley Andrey Shestakov @@ -53,6 +54,7 @@ George Peristerakis Greg Hill Greg Lucas +Greg Retkowski Gábor Antal Haomai Wang He Yongli diff -Nru openstack-trove-5.1.0/ChangeLog openstack-trove-5.1.1/ChangeLog --- openstack-trove-5.1.0/ChangeLog 2016-07-15 15:45:55.000000000 +0000 +++ openstack-trove-5.1.1/ChangeLog 2016-09-06 19:31:49.000000000 +0000 @@ -1,6 +1,14 @@ CHANGES ======= +5.1.1 +----- + +* guest_id missing err, switch config_drive default +* Updated from global requirements +* Use constraints for coverage job +* added release note for requirement change + 5.1.0 ----- diff -Nru openstack-trove-5.1.0/debian/changelog openstack-trove-5.1.1/debian/changelog --- openstack-trove-5.1.0/debian/changelog 2016-07-21 16:21:36.000000000 +0000 +++ openstack-trove-5.1.1/debian/changelog 2016-09-27 19:26:33.000000000 +0000 @@ -1,3 +1,9 @@ +openstack-trove (1:5.1.1-0ubuntu1) xenial; urgency=medium + + * New upstream point release for OpenStack Mitaka (LP: #1619318). + + -- Corey Bryant Tue, 27 Sep 2016 15:26:33 -0400 + openstack-trove (1:5.1.0-0ubuntu1) xenial; urgency=medium * New upstream point release for OpenStack Mitaka (LP: #1604007). diff -Nru openstack-trove-5.1.0/doc/source/dev/building_guest_images.rst openstack-trove-5.1.1/doc/source/dev/building_guest_images.rst --- openstack-trove-5.1.0/doc/source/dev/building_guest_images.rst 2016-07-15 15:43:43.000000000 +0000 +++ openstack-trove-5.1.1/doc/source/dev/building_guest_images.rst 2016-09-06 19:22:33.000000000 +0000 @@ -79,6 +79,20 @@ The Trove Guest Agent runs on the Trove Guest Instance. +------------------------------------------ +Injected Configuration for the Guest Agent +------------------------------------------ + +When TaskManager launches the guest VM it injects the specific settings +for the guest into the VM, into the file /etc/trove/conf.d/guest_info.conf. +The file is injected one of three ways. If use_heat=True, it is injected +during the heat launch process. If use_nova_server_config_drive=True +it is injected via ConfigDrive. Otherwise it is passed to the nova +create call as the 'files' parameter and will be injected based on +the configuration of Nova; the Nova default is to discard the files. +If the settings in guest_info.conf are not present on the guest +Guest Agent will fail to start up. + ------------------------------ Persistent Storage, Networking ------------------------------ diff -Nru openstack-trove-5.1.0/etc/trove/trove-taskmanager.conf.sample openstack-trove-5.1.1/etc/trove/trove-taskmanager.conf.sample --- openstack-trove-5.1.0/etc/trove/trove-taskmanager.conf.sample 2016-07-15 15:43:45.000000000 +0000 +++ openstack-trove-5.1.1/etc/trove/trove-taskmanager.conf.sample 2016-09-06 19:22:34.000000000 +0000 @@ -64,7 +64,7 @@ # Nova server boot options # sets the --config-drive argument when doing a nova boot # (controls how file injection is handled by nova) -use_nova_server_config_drive = False +use_nova_server_config_drive = True # Configuration options for talking to nova via the novaclient. # These options are for an admin user in your keystone config. diff -Nru openstack-trove-5.1.0/PKG-INFO openstack-trove-5.1.1/PKG-INFO --- openstack-trove-5.1.0/PKG-INFO 2016-07-15 15:45:57.000000000 +0000 +++ openstack-trove-5.1.1/PKG-INFO 2016-09-06 19:31:51.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: trove -Version: 5.1.0 +Version: 5.1.1 Summary: OpenStack DBaaS Home-page: http://www.openstack.org/ Author: OpenStack diff -Nru openstack-trove-5.1.0/releasenotes/notes/bump-oslo-concurrency-fc015d789c05d09f.yaml openstack-trove-5.1.1/releasenotes/notes/bump-oslo-concurrency-fc015d789c05d09f.yaml --- openstack-trove-5.1.0/releasenotes/notes/bump-oslo-concurrency-fc015d789c05d09f.yaml 1970-01-01 00:00:00.000000000 +0000 +++ openstack-trove-5.1.1/releasenotes/notes/bump-oslo-concurrency-fc015d789c05d09f.yaml 2016-09-06 19:22:34.000000000 +0000 @@ -0,0 +1,4 @@ +--- +other: + - The minimum version of oslo.concurrency required has been changed + from 3.5.0 to 3.7.1 \ No newline at end of file diff -Nru openstack-trove-5.1.0/test-requirements.txt openstack-trove-5.1.1/test-requirements.txt --- openstack-trove-5.1.0/test-requirements.txt 2016-07-15 15:43:45.000000000 +0000 +++ openstack-trove-5.1.1/test-requirements.txt 2016-09-06 19:22:34.000000000 +0000 @@ -9,7 +9,7 @@ coverage>=3.6 # Apache-2.0 nose # LGPL nosexcover # BSD -openstack-doc-tools>=0.23 # Apache-2.0 +openstack-doc-tools<1.0.0,>=0.23 # Apache-2.0 openstack.nose-plugin>=0.7 # Apache-2.0 WebTest>=2.0 # MIT wsgi-intercept>=0.6.1 # MIT License diff -Nru openstack-trove-5.1.0/tox.ini openstack-trove-5.1.1/tox.ini --- openstack-trove-5.1.0/tox.ini 2016-07-15 15:43:45.000000000 +0000 +++ openstack-trove-5.1.1/tox.ini 2016-09-06 19:22:34.000000000 +0000 @@ -30,12 +30,6 @@ commands = oslo_debug_helper {posargs} [testenv:cover] -# NOTE(amrith) The setting of the install_command in this location -# is only required because currently infra does not actually -# support constraints files for the cover job, and while -# the environment variable UPPER_CONSTRAINTS_FILE is set, there's -# no file there. It can be removed when infra changes this. -install_command = pip install -U {opts} {packages} basepython = python2.7 commands = coverage erase diff -Nru openstack-trove-5.1.0/trove/cmd/guest.py openstack-trove-5.1.1/trove/cmd/guest.py --- openstack-trove-5.1.0/trove/cmd/guest.py 2016-07-15 15:43:45.000000000 +0000 +++ openstack-trove-5.1.1/trove/cmd/guest.py 2016-09-06 19:22:34.000000000 +0000 @@ -40,10 +40,15 @@ from trove.guestagent import dbaas manager = dbaas.datastore_registry().get(CONF.datastore_manager) if not manager: - msg = ("Manager class not registered for datastore manager %s" % + msg = (_LE("Manager class not registered for datastore manager %s") % CONF.datastore_manager) raise RuntimeError(msg) + if not CONF.guest_id: + msg = (_LE("The guest_id parameter is not set. guest_info.conf " + "was not injected into the guest or not read by guestagent")) + raise RuntimeError(msg) + # rpc module must be loaded after decision about thread monkeypatching # because if thread module is not monkeypatched we can't use eventlet # executor from oslo_messaging library. diff -Nru openstack-trove-5.1.0/trove/common/cfg.py openstack-trove-5.1.1/trove/common/cfg.py --- openstack-trove-5.1.0/trove/common/cfg.py 2016-07-15 15:43:45.000000000 +0000 +++ openstack-trove-5.1.1/trove/common/cfg.py 2016-09-06 19:22:34.000000000 +0000 @@ -190,7 +190,7 @@ cfg.IntOpt('trove_conductor_workers', help='Number of workers for the Conductor service. The default ' 'will be the number of CPUs available.'), - cfg.BoolOpt('use_nova_server_config_drive', default=False, + cfg.BoolOpt('use_nova_server_config_drive', default=True, help='Use config drive for file injection when booting ' 'instance.'), cfg.BoolOpt('use_nova_server_volume', default=False, diff -Nru openstack-trove-5.1.0/trove.egg-info/pbr.json openstack-trove-5.1.1/trove.egg-info/pbr.json --- openstack-trove-5.1.0/trove.egg-info/pbr.json 2016-07-15 15:45:56.000000000 +0000 +++ openstack-trove-5.1.1/trove.egg-info/pbr.json 2016-09-06 19:31:49.000000000 +0000 @@ -1 +1 @@ -{"git_version": "94347bd", "is_release": true} \ No newline at end of file +{"git_version": "48fe09a", "is_release": true} \ No newline at end of file diff -Nru openstack-trove-5.1.0/trove.egg-info/PKG-INFO openstack-trove-5.1.1/trove.egg-info/PKG-INFO --- openstack-trove-5.1.0/trove.egg-info/PKG-INFO 2016-07-15 15:45:56.000000000 +0000 +++ openstack-trove-5.1.1/trove.egg-info/PKG-INFO 2016-09-06 19:31:49.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: trove -Version: 5.1.0 +Version: 5.1.1 Summary: OpenStack DBaaS Home-page: http://www.openstack.org/ Author: OpenStack diff -Nru openstack-trove-5.1.0/trove.egg-info/SOURCES.txt openstack-trove-5.1.1/trove.egg-info/SOURCES.txt --- openstack-trove-5.1.0/trove.egg-info/SOURCES.txt 2016-07-15 15:45:57.000000000 +0000 +++ openstack-trove-5.1.1/trove.egg-info/SOURCES.txt 2016-09-06 19:31:50.000000000 +0000 @@ -279,6 +279,7 @@ etc/trove/conf.d/guest_info.conf releasenotes/notes/.placeholder releasenotes/notes/add-cors-support-fe3ecbecb68f7efd.yaml +releasenotes/notes/bump-oslo-concurrency-fc015d789c05d09f.yaml releasenotes/notes/cassandra-backup-and-restore-00de234de67ea5ee.yaml releasenotes/notes/cassandra-configuration-groups-e6bcf4014a79f14f.yaml releasenotes/notes/cassandra-user-functions-041abfa4f4baa591.yaml