diff options
| -rw-r--r-- | CONTRIBUTING.rst | 17 | ||||
| -rw-r--r-- | MANIFEST.in | 2 | ||||
| -rw-r--r-- | ceilometer/openstack/common/setup.py | 367 | ||||
| -rw-r--r-- | ceilometer/openstack/common/version.py | 94 | ||||
| -rw-r--r-- | openstack-common.conf | 2 | ||||
| -rw-r--r-- | setup.cfg | 87 | ||||
| -rwxr-xr-x | setup.py | 152 | ||||
| -rw-r--r-- | tools/pip-requires | 2 | ||||
| -rw-r--r-- | tools/test-requires | 4 |
9 files changed, 122 insertions, 605 deletions
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst new file mode 100644 index 00000000..be8217fd --- /dev/null +++ b/CONTRIBUTING.rst @@ -0,0 +1,17 @@ +If you would like to contribute to the development of OpenStack, +you must follow the steps in the "If you're a developer, start here" +section of this page: + + http://wiki.openstack.org/HowToContribute + +Once those steps have been completed, changes to OpenStack +should be submitted for review via the Gerrit tool, following +the workflow documented at: + + http://wiki.openstack.org/GerritWorkflow + +Pull requests submitted through GitHub will be ignored. + +Bugs should be filed on Launchpad, not GitHub: + + https://bugs.launchpad.net/ceilometer diff --git a/MANIFEST.in b/MANIFEST.in index d5a2fbdf..9006dd50 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,8 +1,10 @@ include AUTHORS include ChangeLog +include CONTRIBUTING.txt include ceilometer/storage/sqlalchemy/migrate_repo/migrate.cfg exclude .gitignore exclude .gitreview +include ReleaseNotes graft tests graft etc recursive-include nova_tests *.py diff --git a/ceilometer/openstack/common/setup.py b/ceilometer/openstack/common/setup.py deleted file mode 100644 index ba6b54af..00000000 --- a/ceilometer/openstack/common/setup.py +++ /dev/null @@ -1,367 +0,0 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - -# Copyright 2011 OpenStack Foundation. -# Copyright 2012-2013 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -""" -Utilities with minimum-depends for use in setup.py -""" - -import email -import os -import re -import subprocess -import sys - -from setuptools.command import sdist - - -def parse_mailmap(mailmap='.mailmap'): - mapping = {} - if os.path.exists(mailmap): - with open(mailmap, 'r') as fp: - for l in fp: - try: - canonical_email, alias = re.match( - r'[^#]*?(<.+>).*(<.+>).*', l).groups() - except AttributeError: - continue - mapping[alias] = canonical_email - return mapping - - -def _parse_git_mailmap(git_dir, mailmap='.mailmap'): - mailmap = os.path.join(os.path.dirname(git_dir), mailmap) - return parse_mailmap(mailmap) - - -def canonicalize_emails(changelog, mapping): - """Takes in a string and an email alias mapping and replaces all - instances of the aliases in the string with their real email. - """ - for alias, email_address in mapping.iteritems(): - changelog = changelog.replace(alias, email_address) - return changelog - - -# Get requirements from the first file that exists -def get_reqs_from_files(requirements_files): - for requirements_file in requirements_files: - if os.path.exists(requirements_file): - with open(requirements_file, 'r') as fil: - return fil.read().split('\n') - return [] - - -def parse_requirements(requirements_files=['requirements.txt', - 'tools/pip-requires']): - requirements = [] - for line in get_reqs_from_files(requirements_files): - # For the requirements list, we need to inject only the portion - # after egg= so that distutils knows the package it's looking for - # such as: - # -e git://github.com/openstack/nova/master#egg=nova - if re.match(r'\s*-e\s+', line): - requirements.append(re.sub(r'\s*-e\s+.*#egg=(.*)$', r'\1', - line)) - # such as: - # http://github.com/openstack/nova/zipball/master#egg=nova - elif re.match(r'\s*https?:', line): - requirements.append(re.sub(r'\s*https?:.*#egg=(.*)$', r'\1', - line)) - # -f lines are for index locations, and don't get used here - elif re.match(r'\s*-f\s+', line): - pass - # argparse is part of the standard library starting with 2.7 - # adding it to the requirements list screws distro installs - elif line == 'argparse' and sys.version_info >= (2, 7): - pass - else: - requirements.append(line) - - return requirements - - -def parse_dependency_links(requirements_files=['requirements.txt', - 'tools/pip-requires']): - dependency_links = [] - # dependency_links inject alternate locations to find packages listed - # in requirements - for line in get_reqs_from_files(requirements_files): - # skip comments and blank lines - if re.match(r'(\s*#)|(\s*$)', line): - continue - # lines with -e or -f need the whole line, minus the flag - if re.match(r'\s*-[ef]\s+', line): - dependency_links.append(re.sub(r'\s*-[ef]\s+', '', line)) - # lines that are only urls can go in unmolested - elif re.match(r'\s*https?:', line): - dependency_links.append(line) - return dependency_links - - -def _run_shell_command(cmd, throw_on_error=False): - if os.name == 'nt': - output = subprocess.Popen(["cmd.exe", "/C", cmd], - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - else: - output = subprocess.Popen(["/bin/sh", "-c", cmd], - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - out = output.communicate() - if output.returncode and throw_on_error: - raise Exception("%s returned %d" % cmd, output.returncode) - if len(out) == 0: - return None - if len(out[0].strip()) == 0: - return None - return out[0].strip() - - -def _get_git_directory(): - parent_dir = os.path.dirname(__file__) - while True: - git_dir = os.path.join(parent_dir, '.git') - if os.path.exists(git_dir): - return git_dir - parent_dir, child = os.path.split(parent_dir) - if not child: # reached to root dir - return None - - -def write_git_changelog(): - """Write a changelog based on the git changelog.""" - new_changelog = 'ChangeLog' - git_dir = _get_git_directory() - if not os.getenv('SKIP_WRITE_GIT_CHANGELOG'): - if git_dir: - git_log_cmd = 'git --git-dir=%s log' % git_dir - changelog = _run_shell_command(git_log_cmd) - mailmap = _parse_git_mailmap(git_dir) - with open(new_changelog, "w") as changelog_file: - changelog_file.write(canonicalize_emails(changelog, mailmap)) - else: - open(new_changelog, 'w').close() - - -def generate_authors(): - """Create AUTHORS file using git commits.""" - jenkins_email = 'jenkins@review.(openstack|stackforge).org' - old_authors = 'AUTHORS.in' - new_authors = 'AUTHORS' - git_dir = _get_git_directory() - if not os.getenv('SKIP_GENERATE_AUTHORS'): - if git_dir: - # don't include jenkins email address in AUTHORS file - git_log_cmd = ("git --git-dir=" + git_dir + - " log --format='%aN <%aE>' | sort -u | " - "egrep -v '" + jenkins_email + "'") - changelog = _run_shell_command(git_log_cmd) - signed_cmd = ("git --git-dir=" + git_dir + - " log | grep -i Co-authored-by: | sort -u") - signed_entries = _run_shell_command(signed_cmd) - if signed_entries: - new_entries = "\n".join( - [signed.split(":", 1)[1].strip() - for signed in signed_entries.split("\n") if signed]) - changelog = "\n".join((changelog, new_entries)) - mailmap = _parse_git_mailmap(git_dir) - with open(new_authors, 'w') as new_authors_fh: - new_authors_fh.write(canonicalize_emails(changelog, mailmap)) - if os.path.exists(old_authors): - with open(old_authors, "r") as old_authors_fh: - new_authors_fh.write('\n' + old_authors_fh.read()) - else: - open(new_authors, 'w').close() - - -_rst_template = """%(heading)s -%(underline)s - -.. automodule:: %(module)s - :members: - :undoc-members: - :show-inheritance: -""" - - -def get_cmdclass(): - """Return dict of commands to run from setup.py.""" - - cmdclass = dict() - - def _find_modules(arg, dirname, files): - for filename in files: - if filename.endswith('.py') and filename != '__init__.py': - arg["%s.%s" % (dirname.replace('/', '.'), - filename[:-3])] = True - - class LocalSDist(sdist.sdist): - """Builds the ChangeLog and Authors files from VC first.""" - - def run(self): - write_git_changelog() - generate_authors() - # sdist.sdist is an old style class, can't use super() - sdist.sdist.run(self) - - cmdclass['sdist'] = LocalSDist - - # If Sphinx is installed on the box running setup.py, - # enable setup.py to build the documentation, otherwise, - # just ignore it - try: - from sphinx.setup_command import BuildDoc - - class LocalBuildDoc(BuildDoc): - - builders = ['html', 'man'] - - def generate_autoindex(self): - print "**Autodocumenting from %s" % os.path.abspath(os.curdir) - modules = {} - option_dict = self.distribution.get_option_dict('build_sphinx') - source_dir = os.path.join(option_dict['source_dir'][1], 'api') - if not os.path.exists(source_dir): - os.makedirs(source_dir) - for pkg in self.distribution.packages: - if '.' not in pkg: - os.path.walk(pkg, _find_modules, modules) - module_list = modules.keys() - module_list.sort() - autoindex_filename = os.path.join(source_dir, 'autoindex.rst') - with open(autoindex_filename, 'w') as autoindex: - autoindex.write(""".. toctree:: - :maxdepth: 1 - -""") - for module in module_list: - output_filename = os.path.join(source_dir, - "%s.rst" % module) - heading = "The :mod:`%s` Module" % module - underline = "=" * len(heading) - values = dict(module=module, heading=heading, - underline=underline) - - print "Generating %s" % output_filename - with open(output_filename, 'w') as output_file: - output_file.write(_rst_template % values) - autoindex.write(" %s.rst\n" % module) - - def run(self): - if not os.getenv('SPHINX_DEBUG'): - self.generate_autoindex() - - for builder in self.builders: - self.builder = builder - self.finalize_options() - self.project = self.distribution.get_name() - self.version = self.distribution.get_version() - self.release = self.distribution.get_version() - BuildDoc.run(self) - - class LocalBuildLatex(LocalBuildDoc): - builders = ['latex'] - - cmdclass['build_sphinx'] = LocalBuildDoc - cmdclass['build_sphinx_latex'] = LocalBuildLatex - except ImportError: - pass - - return cmdclass - - -def _get_revno(git_dir): - """Return the number of commits since the most recent tag. - - We use git-describe to find this out, but if there are no - tags then we fall back to counting commits since the beginning - of time. - """ - describe = _run_shell_command( - "git --git-dir=%s describe --always" % git_dir) - if "-" in describe: - return describe.rsplit("-", 2)[-2] - - # no tags found - revlist = _run_shell_command( - "git --git-dir=%s rev-list --abbrev-commit HEAD" % git_dir) - return len(revlist.splitlines()) - - -def _get_version_from_git(pre_version): - """Return a version which is equal to the tag that's on the current - revision if there is one, or tag plus number of additional revisions - if the current revision has no tag.""" - - git_dir = _get_git_directory() - if git_dir: - if pre_version: - try: - return _run_shell_command( - "git --git-dir=" + git_dir + " describe --exact-match", - throw_on_error=True).replace('-', '.') - except Exception: - sha = _run_shell_command( - "git --git-dir=" + git_dir + " log -n1 --pretty=format:%h") - return "%s.a%s.g%s" % (pre_version, _get_revno(git_dir), sha) - else: - return _run_shell_command( - "git --git-dir=" + git_dir + " describe --always").replace( - '-', '.') - return None - - -def _get_version_from_pkg_info(package_name): - """Get the version from PKG-INFO file if we can.""" - try: - pkg_info_file = open('PKG-INFO', 'r') - except (IOError, OSError): - return None - try: - pkg_info = email.message_from_file(pkg_info_file) - except email.MessageError: - return None - # Check to make sure we're in our own dir - if pkg_info.get('Name', None) != package_name: - return None - return pkg_info.get('Version', None) - - -def get_version(package_name, pre_version=None): - """Get the version of the project. First, try getting it from PKG-INFO, if - it exists. If it does, that means we're in a distribution tarball or that - install has happened. Otherwise, if there is no PKG-INFO file, pull the - version from git. - - We do not support setup.py version sanity in git archive tarballs, nor do - we support packagers directly sucking our git repo into theirs. We expect - that a source tarball be made from our git repo - or that if someone wants - to make a source tarball from a fork of our repo with additional tags in it - that they understand and desire the results of doing that. - """ - version = os.environ.get("OSLO_PACKAGE_VERSION", None) - if version: - return version - version = _get_version_from_pkg_info(package_name) - if version: - return version - version = _get_version_from_git(pre_version) - if version: - return version - raise Exception("Versioning for this project requires either an sdist" - " tarball, or access to an upstream git repository.") diff --git a/ceilometer/openstack/common/version.py b/ceilometer/openstack/common/version.py deleted file mode 100644 index d1f83682..00000000 --- a/ceilometer/openstack/common/version.py +++ /dev/null @@ -1,94 +0,0 @@ - -# Copyright 2012 OpenStack Foundation -# Copyright 2012-2013 Hewlett-Packard Development Company, L.P. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -""" -Utilities for consuming the version from pkg_resources. -""" - -import pkg_resources - - -class VersionInfo(object): - - def __init__(self, package): - """Object that understands versioning for a package - :param package: name of the python package, such as glance, or - python-glanceclient - """ - self.package = package - self.release = None - self.version = None - self._cached_version = None - - def __str__(self): - """Make the VersionInfo object behave like a string.""" - return self.version_string() - - def __repr__(self): - """Include the name.""" - return "VersionInfo(%s:%s)" % (self.package, self.version_string()) - - def _get_version_from_pkg_resources(self): - """Get the version of the package from the pkg_resources record - associated with the package.""" - try: - requirement = pkg_resources.Requirement.parse(self.package) - provider = pkg_resources.get_provider(requirement) - return provider.version - except pkg_resources.DistributionNotFound: - # The most likely cause for this is running tests in a tree - # produced from a tarball where the package itself has not been - # installed into anything. Revert to setup-time logic. - from ceilometer.openstack.common import setup - return setup.get_version(self.package) - - def release_string(self): - """Return the full version of the package including suffixes indicating - VCS status. - """ - if self.release is None: - self.release = self._get_version_from_pkg_resources() - - return self.release - - def version_string(self): - """Return the short version minus any alpha/beta tags.""" - if self.version is None: - parts = [] - for part in self.release_string().split('.'): - if part[0].isdigit(): - parts.append(part) - else: - break - self.version = ".".join(parts) - - return self.version - - # Compatibility functions - canonical_version_string = version_string - version_string_with_vcs = release_string - - def cached_version_string(self, prefix=""): - """Generate an object which will expand in a string context to - the results of version_string(). We do this so that don't - call into pkg_resources every time we start up a program when - passing version information into the CONF constructor, but - rather only do the calculation when and if a version is requested - """ - if not self._cached_version: - self._cached_version = "%s%s" % (prefix, - self.version_string()) - return self._cached_version diff --git a/openstack-common.conf b/openstack-common.conf index 82087ac1..2fd4ac4c 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -13,8 +13,6 @@ module=notifier module=policy module=rpc module=service -module=setup module=threadgroup module=timeutils -module=version base=ceilometer @@ -1,3 +1,90 @@ +[metadata] +name = ceilometer +version = 2013.2 +summary = OpenStack Metering +description-file = + README.md +author = OpenStack +author-email = openstack-dev@lists.openstack.org +home-page = http://www.openstack.org/ +classifier = + Environment :: OpenStack + Intended Audience :: Information Technology + Intended Audience :: System Administrators + License :: OSI Approved :: Apache Software License + Operating System :: POSIX :: Linux + Programming Language :: Python + Programming Language :: Python :: 2 + Programming Language :: Python :: 2.6 + Programming Language :: Python :: 2.7 + Topic :: System :: Monitoring + +[global] +setup-hooks = + pbr.hooks.setup_hook + +[files] +packages = + ceilometer +scripts = + bin/ceilometer-agent-compute + bin/ceilometer-agent-central + bin/ceilometer-api + bin/ceilometer-collector + bin/ceilometer-dbsync + +[entry_points] +ceilometer.collector = + instance = ceilometer.compute.notifications:Instance + instance_flavor = ceilometer.compute.notifications:InstanceFlavor + instance_delete = ceilometer.compute.notifications:InstanceDelete + memory = ceilometer.compute.notifications:Memory + vcpus = ceilometer.compute.notifications:VCpus + disk_root_size = ceilometer.compute.notifications:RootDiskSize + disk_ephemeral_size = ceilometer.compute.notifications:EphemeralDiskSize + volume = ceilometer.volume.notifications:Volume + volume_size = ceilometer.volume.notifications:VolumeSize + image_crud = ceilometer.image.notifications:ImageCRUD + image = ceilometer.image.notifications:Image + image_size = ceilometer.image.notifications:ImageSize + image_download = ceilometer.image.notifications:ImageDownload + image_serve = ceilometer.image.notifications:ImageServe + network = ceilometer.network.notifications:Network + subnet = ceilometer.network.notifications:Subnet + port = ceilometer.network.notifications:Port + router = ceilometer.network.notifications:Router + floatingip = ceilometer.network.notifications:FloatingIP + +ceilometer.poll.compute = + diskio = ceilometer.compute.pollsters:DiskIOPollster + cpu = ceilometer.compute.pollsters:CPUPollster + net = ceilometer.compute.pollsters:NetPollster + instance = ceilometer.compute.pollsters:InstancePollster + +ceilometer.poll.central = + network_floatingip = ceilometer.network.floatingip:FloatingIPPollster + image = ceilometer.image.glance:ImagePollster + objectstore = ceilometer.objectstore.swift:SwiftPollster + kwapi = ceilometer.energy.kwapi:KwapiPollster + +ceilometer.storage = + log = ceilometer.storage.impl_log:LogStorage + mongodb = ceilometer.storage.impl_mongodb:MongoDBStorage + mysql = ceilometer.storage.impl_sqlalchemy:SQLAlchemyStorage + postgresql = ceilometer.storage.impl_sqlalchemy:SQLAlchemyStorage + sqlite = ceilometer.storage.impl_sqlalchemy:SQLAlchemyStorage + hbase = ceilometer.storage.impl_hbase:HBaseStorage + +ceilometer.compute.virt = + libvirt = ceilometer.compute.virt.libvirt.inspector:LibvirtInspector + +ceilometer.transformer = + accumulator = ceilometer.transformer.accumulator:TransformerAccumulator + +ceilometer.publisher = + meter_publisher = ceilometer.publisher.meter_publish:MeterPublisher + meter = ceilometer.publisher.meter:MeterPublisher + [nosetests] cover-package = ceilometer cover-html = true @@ -1,149 +1,21 @@ #!/usr/bin/env python -# -*- encoding: utf-8 -*- +# Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # -# Copyright © 2012 eNovance <licensing@enovance.com> +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # -# Author: Julien Danjou <julien@danjou.info> -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. -import os import setuptools -import textwrap - -from ceilometer.openstack.common import setup as common_setup - -requires = common_setup.parse_requirements(['tools/pip-requires']) -depend_links = common_setup.parse_dependency_links(['tools/pip-requires']) -project = 'ceilometer' -version = common_setup.get_version(project, '2013.2') - -url_base = 'http://tarballs.openstack.org/ceilometer/ceilometer-%s.tar.gz' - - -def directories(target_dir): - return [dirpath - for dirpath, dirnames, filenames in os.walk(target_dir)] - setuptools.setup( - - name='ceilometer', - version=version, - - description='cloud computing metering', - - author='OpenStack', - author_email='ceilometer@lists.launchpad.net', - - url='https://launchpad.net/ceilometer', - download_url=url_base % version, - - classifiers=[ - 'Development Status :: 3 - Alpha', - 'Framework :: Setuptools Plugin', - 'Environment :: OpenStack', - 'Intended Audience :: Information Technology', - 'Intended Audience :: System Administrators', - 'License :: OSI Approved :: Apache Software License', - 'Operating System :: POSIX :: Linux', - 'Programming Language :: Python', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Topic :: System :: Monitoring', - ], - - packages=setuptools.find_packages(exclude=['bin', - 'tests', - 'tests.*', - '*.tests', - 'nova_tests']), - cmdclass=common_setup.get_cmdclass(), - package_data={ - "ceilometer": - directories("ceilometer/api/static") - + directories("ceilometer/api/templates"), - }, - include_package_data=True, - - test_suite='nose.collector', - - scripts=['bin/ceilometer-agent-compute', - 'bin/ceilometer-agent-central', - 'bin/ceilometer-api', - 'bin/ceilometer-collector', - 'bin/ceilometer-dbsync'], - - py_modules=[], - - install_requires=requires, - dependency_links=depend_links, - - zip_safe=False, - - entry_points=textwrap.dedent(""" - [ceilometer.collector] - instance = ceilometer.compute.notifications:Instance - instance_flavor = ceilometer.compute.notifications:InstanceFlavor - instance_delete = ceilometer.compute.notifications:InstanceDelete - memory = ceilometer.compute.notifications:Memory - vcpus = ceilometer.compute.notifications:VCpus - disk_root_size = ceilometer.compute.notifications:RootDiskSize - disk_ephemeral_size = ceilometer.compute.notifications:EphemeralDiskSize - volume = ceilometer.volume.notifications:Volume - volume_size = ceilometer.volume.notifications:VolumeSize - image_crud = ceilometer.image.notifications:ImageCRUD - image = ceilometer.image.notifications:Image - image_size = ceilometer.image.notifications:ImageSize - image_download = ceilometer.image.notifications:ImageDownload - image_serve = ceilometer.image.notifications:ImageServe - network = ceilometer.network.notifications:Network - subnet = ceilometer.network.notifications:Subnet - port = ceilometer.network.notifications:Port - router = ceilometer.network.notifications:Router - floatingip = ceilometer.network.notifications:FloatingIP - - [ceilometer.poll.compute] - diskio = ceilometer.compute.pollsters:DiskIOPollster - cpu = ceilometer.compute.pollsters:CPUPollster - net = ceilometer.compute.pollsters:NetPollster - instance = ceilometer.compute.pollsters:InstancePollster - - [ceilometer.poll.central] - network_floatingip = ceilometer.network.floatingip:FloatingIPPollster - image = ceilometer.image.glance:ImagePollster - objectstore = ceilometer.objectstore.swift:SwiftPollster - kwapi = ceilometer.energy.kwapi:KwapiPollster - - [ceilometer.storage] - log = ceilometer.storage.impl_log:LogStorage - mongodb = ceilometer.storage.impl_mongodb:MongoDBStorage - mysql = ceilometer.storage.impl_sqlalchemy:SQLAlchemyStorage - postgresql = ceilometer.storage.impl_sqlalchemy:SQLAlchemyStorage - sqlite = ceilometer.storage.impl_sqlalchemy:SQLAlchemyStorage - hbase = ceilometer.storage.impl_hbase:HBaseStorage - - [ceilometer.compute.virt] - libvirt = ceilometer.compute.virt.libvirt.inspector:LibvirtInspector - - [ceilometer.transformer] - accumulator = ceilometer.transformer.accumulator:TransformerAccumulator - - [ceilometer.publisher] - meter_publisher = ceilometer.publisher.meter:MeterPublisher - meter = ceilometer.publisher.meter:MeterPublisher - - [paste.filter_factory] - swift=ceilometer.objectstore.swift_middleware:filter_factory - """), -) + setup_requires=['d2to1>=0.2.10,<0.3', 'pbr>=0.5,<0.6'], + d2to1=True) diff --git a/tools/pip-requires b/tools/pip-requires index b2d13323..93019b91 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -1,3 +1,5 @@ +d2to1>=0.2.10,<0.3 +pbr>=0.5,<0.6 WebOb>=1.2 kombu iso8601 diff --git a/tools/test-requires b/tools/test-requires index 672a5547..c13cf8e8 100644 --- a/tools/test-requires +++ b/tools/test-requires @@ -8,8 +8,8 @@ Babel>=0.9.6 # implementation of MongoDB. # NOTE(jd): the support for finalize in map reduce in MIM is not yet merged # git+http://git.naquadah.org/git/~jd/merciless.git#egg=Ming -http://tarballs.openstack.org/nova/nova-master.tar.gz -http://tarballs.openstack.org/glance/glance-master.tar.gz +http://tarballs.openstack.org/nova/nova-master.tar.gz#egg=nova +http://tarballs.openstack.org/glance/glance-master.tar.gz#egg=glance setuptools-git>=0.4 # We should use swift>1.7.5, but it's not yet available swift |