Merge "Make Kolla installable via PIP"

kolla/__init__.py

+# 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.
+
+import threading
+
+import pbr.version
+
+
+__version__ = pbr.version.VersionInfo(
+    'kolla').version_string()
+
+# Make a project global TLS trace storage repository
+TLS = threading.local()

requirements.txt

+pbr<2.0,>=1.4
 docker-py>=1.1.0  # Apache-2.0
 Jinja2>=2.6  # BSD License (3 clause)

setup.cfg

+[metadata]
+name = kolla
+version = 0.1.0
+summary = Kolla OpenStack Deployment
+description-file =
+    README.rst
+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.7
+
+[files]
+packages =
+    kolla
+data_files =
+    share/kolla/ansible = ansible/*
+    share/kolla/devenv = devenv/*
+    share/kolla/docker = docker/*
+    share/kolla/docker_templates = docker_templates/*
+    share/kolla/docs = docs/*
+    share/kolla/etc_examples = etc/*
+    share/kolla/vagrant = vagrant/*
+    share/kolla = tools/init-runonce
+    share/kolla = tools/openrc-example
+
+scripts =
+    tools/kolla-ansible
+
+[entry_points]
+console_scripts =
+    kolla-build = kolla.cmd.build:main
+
+[global]
+setup-hooks =
+    pbr.hooks.setup_hook
+
+[pbr]
+
+[build_sphinx]
+all_files = 1
+build-dir = doc/build
+source-dir = docs

setup.py

+# Copyright (c) 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.
+
+# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
+import setuptools
+
+# In python < 2.7.4, a lazy loading of package `pbr` will break
+# setuptools if some other modules registered functions in `atexit`.
+# solution from: http://bugs.python.org/issue15881#msg170215
+try:
+    import multiprocessing  # noqa
+except ImportError:
+    pass
+
+setuptools.setup(
+    setup_requires=['pbr>=1.3'],
+    pbr=True)

tests/test_build.py

@@ -19,7 +19,7 @@ from oslotest import base
 
 import sys
 sys.path.append(path.abspath(path.join(path.dirname(__file__), '../tools')))
-from tools import build
+from kolla.cmd import build
 
 LOG = logging.getLogger(__name__)