Merge "Update the project to refer openstack projects"

AUTHORS

@@ -0,0 +1,2 @@
+Sahid Orentino Ferdajoui <sahid.ferdjaoui@gmail.com>
+Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>

ChangeLog

@@ -0,0 +1,59 @@
+CHANGES
+=======
+
+* Update the project to refer openstack projects
+* Fix gateway_ip for a subnet
+* Fix dhcp options in a netwok
+* Fix deps
+* Fix dep version with Babel
+* Removes the dep with write-multipart
+* Fix bug with secgroups rules
+* Fix bug version
+* Update the reamde to add note
+* Review of the README
+* Review of the readme
+* Fix bug with version and deps
+* Review of the readme
+* Fix regression
+* Proposal a solution to catch secs rule already existing bug need better
+* Fix temporal bug with router to find interface/gateway
+* Adds supports to not recreate already existed resource
+* Nothing special, just update the version for pypi
+* Adds version to the package
+* Fix bug when the key already exists
+* Nothing imortant
+* misspelling
+* Adds more info to the readme
+* Fix deps
+* Adds url of the source project
+* Finds a betterr solution to handle keypari
+* Fix bug, Erase same keyname
+* Updates version
+* Adds zone
+* I just forgot to incr version for pyton package
+* Improves readem
+* Not necessary to wati
+* Configures packages
+* Adds min and max count for start server
+* Fix components
+* Provides user data
+* Fix orchestration
+* Adds support of userdata
+* Provides support to add network to an instance
+* Improves readme
+* Fix usage message
+* Adds dependance
+* Provides verbose mode
+* Fix bug packages
+* Creates a package
+* Rm unecessary file
+* Adds license and version
+* Enable new compoenents
+* Full review + more documented
+* Adds new resources (network, subnet, router...)
+* Adds rule to .gitignore
+* Adds tests
+* Adds a new method to delete resource
+* Uses now env values to identify
+* Fix a bug wih wait_for_instance
+* First commit to keep trace of this project

MANIFEST.in

@@ -0,0 +1,6 @@
+include AUTHORS
+include ChangeLog
+exclude .gitignore
+exclude .gitreview
+
+global-exclude *.pyc

requirements.txt

@@ -0,0 +1,7 @@
+pbr>=0.6,<1.0
+six>=1.5.2
+Babel>=1.3
+requests>=1.1
+PyYAML>=3.1.0
+python-openstackclient==0.2.2
+python-neutronclient>=2.3.4,<3

setup.cfg

@@ -0,0 +1,24 @@
+[metadata]
+name = warm
+summary = Deploy OpenStack resources from Yaml templates.
+description-file =
+    README
+author = Sahid Orentino Ferdjaoui
+author-email = sahid.ferdjaoui@cloudwatt.com
+home-page = https://wiki.openstack.org/wiki/Warm
+classifier =
+    Environment :: OpenStack
+    License :: OSI Approved :: Apache Software License
+    Intended Audience :: Developers
+    Intended Audience :: System Administrators
+    Programming Language :: Python
+    Operating System :: MacOS :: MacOS X
+    Operating System :: POSIX :: Linux
+
+[files]
+packages =
+    warm
+
+[entry_points]
+console_scripts =
+    warm = warm:main

setup.py

@@ -15,42 +15,8 @@
 #   under the License.
 #
 
-import os
 import setuptools
 
-execfile("warm/version.py")
-
 setuptools.setup(
-    name="warm",
-    version=__version__,
-    author="Sahid Orentino Ferdjaoui (Cloudwatt)",
-    author_email="sahid.ferdjaoui@cloudwatt.com",
-    description="Deploy a simple OpenStack environment from template",
-    long_description=(open(os.path.join(os.getcwd(), "README")).read()),
-    license="Apache License 2.0",
-    keywords=["openstack", "cloudwatt", "deploy", "cloud"],
-    classifiers=[
-        "Development Status :: 4 - Beta",
-        "Intended Audience :: Developers",
-        "License :: OSI Approved :: Apache Software License",
-        "Natural Language :: English",
-        "Operating System :: MacOS :: MacOS X",
-        "Operating System :: POSIX :: Linux",
-        "Programming Language :: Python",
-        "Environment :: OpenStack",
-    ],
-    url="https://github.com/sahid/warm.git",
-    packages=["warm", "warm.components"],
-    install_requires=[
-        "requests>=1.1,<1.2.3",
-        "six>=1.4.1",
-        "Babel==1.3",
-        "distribute",
-        "pyyaml",
-        "python-openstackclient==0.2.2",
-        "python-neutronclient",
-    ],
-    entry_points="""
-        [console_scripts]
-        warm = warm:main""",
-    )
+    setup_requires=['pbr'],
+    pbr=True)

warm/version.py

@@ -14,4 +14,8 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 #
-__version__ = "0.3.1"
+
+import pbr.version
+
+__version__ = pbr.version.VersionInfo('warm').version_string()
+