From b0b950aa2928c659b0710bb2da1668ccfe4d5107 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Tue, 8 Jan 2013 17:19:03 +0000 Subject: [PATCH] Removes now obsolete patches (applied upstream). Rewritten-From: 077fd6848eb4ddbfaee1eaa46b123ac9a039050d --- .../patches/fixes-ceilometer-dbsync.patch | 12 ---- ...removes-needs-for-wsme-python-module.patch | 68 ------------------- trusty/debian/patches/series | 2 - 3 files changed, 82 deletions(-) delete mode 100644 trusty/debian/patches/fixes-ceilometer-dbsync.patch delete mode 100644 trusty/debian/patches/removes-needs-for-wsme-python-module.patch diff --git a/trusty/debian/patches/fixes-ceilometer-dbsync.patch b/trusty/debian/patches/fixes-ceilometer-dbsync.patch deleted file mode 100644 index ec6700b..0000000 --- a/trusty/debian/patches/fixes-ceilometer-dbsync.patch +++ /dev/null @@ -1,12 +0,0 @@ -Description: Fixes ceilometer-dbsync which was failing -Author: Julien Danjou -Origin: upstream, https://github.com/openstack/ceilometer/commit/eada7872f2cf935d9a6e8e7cd410a895bee979e7 - ---- ceilometer-2013.1~g0.4+23ff2f9bbf.orig/bin/ceilometer-dbsync -+++ ceilometer-2013.1~g0.4+23ff2f9bbf/bin/ceilometer-dbsync -@@ -25,4 +25,4 @@ from ceilometer.openstack.common import - - if __name__ == '__main__': - service.prepare_service(sys.argv) -- storage.get_connection(cfg.CONF).db_sync() -+ storage.get_connection(cfg.CONF).upgrade() diff --git a/trusty/debian/patches/removes-needs-for-wsme-python-module.patch b/trusty/debian/patches/removes-needs-for-wsme-python-module.patch deleted file mode 100644 index 70bdfaf..0000000 --- a/trusty/debian/patches/removes-needs-for-wsme-python-module.patch +++ /dev/null @@ -1,68 +0,0 @@ -Description: Removes the need for WSME -Author: Julien Danjou -Origin: upstream, https://review.openstack.org/#/c/18477/ - ---- ceilometer-2013.1~g0.4+23ff2f9bbf.orig/bin/ceilometer-api -+++ ceilometer-2013.1~g0.4+23ff2f9bbf/bin/ceilometer-api -@@ -18,15 +18,10 @@ - # under the License. - """Set up the development API server. - """ --import os - import sys --from wsgiref import simple_server - --from pecan import configuration -- --from ceilometer.api import acl --from ceilometer.api import app --from ceilometer.api import config as api_config -+from ceilometer.api.v1 import acl -+from ceilometer.api.v1 import app - from ceilometer.openstack.common import cfg - from ceilometer.openstack.common import log as logging - -@@ -37,34 +32,15 @@ if __name__ == '__main__': - # inputs. - acl.register_opts(cfg.CONF) - -- # Parse OpenStack config file and command line options, then -- # configure logging. -+ # Parse config file and command line options, -+ # then configure logging. - cfg.CONF(sys.argv[1:]) - logging.setup('ceilometer.api') - -- # Set up the pecan configuration -- filename = api_config.__file__.replace('.pyc', '.py') -- pecan_config = configuration.conf_from_file(filename) -- -- # Build the WSGI app -- root = app.setup_app(pecan_config, -- extra_hooks=[acl.AdminAuthHook()]) -- root = acl.install(root, cfg.CONF) -- -- # Create the WSGI server and start it -- host, port = '0.0.0.0', int(cfg.CONF.metering_api_port) -- srv = simple_server.make_server(host, port, root) -- -- print 'Starting server in PID %s' % os.getpid() -- -- if host == '0.0.0.0': -- print 'serving on 0.0.0.0:%s, view at http://127.0.0.1:%s' % \ -- (port, port) -- else: -- print "serving on http://%s:%s" % (host, port) -- -- try: -- srv.serve_forever() -- except KeyboardInterrupt: -- # allow CTRL+C to shutdown without an error -- pass -+ root = app.make_app() -+ -+ # Enable debug mode -+ if cfg.CONF.verbose or cfg.CONF.debug: -+ root.debug = True -+ -+ root.run(host='0.0.0.0', port=cfg.CONF.metering_api_port) diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series index 76ec6e1..333da88 100644 --- a/trusty/debian/patches/series +++ b/trusty/debian/patches/series @@ -1,4 +1,2 @@ install-missing-files.patch updates-versioninfo.patch -fixes-ceilometer-dbsync.patch -removes-needs-for-wsme-python-module.patch -- 2.32.3