From a6e8fdbe22bd153c78a008b92cd5d1c245bc63e3 Mon Sep 17 00:00:00 2001
From: Ahmad Mahmoudi <am495p@att.com>
Date: Mon, 22 Oct 2018 10:30:36 -0500
Subject: [PATCH] Enable using PBR for package library

Updated promenade packaging scripts to use pbr.
This was done to make sure all required packages
for promenade package library are pulled, when another
moudle does git pull to use promenade package library.

Change-Id: I820ac6513c42456d52f92dab72dba2a34d8b437b
---
 Dockerfile            |  3 +++
 setup.cfg             | 28 ++++++++++++++++++++++++++++
 setup.py              | 18 ++----------------
 test-requirements.txt |  2 +-
 4 files changed, 34 insertions(+), 17 deletions(-)
 create mode 100644 setup.cfg

diff --git a/Dockerfile b/Dockerfile
index e1ad2d50..279ef5b2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,6 +31,9 @@ WORKDIR /opt/promenade
 ENV PORT 9000
 EXPOSE $PORT
 
+# Setting promenade version for BPR
+ENV PBR_VERSION 0.8.0
+
 ENTRYPOINT ["/opt/promenade/entrypoint.sh"]
 
 RUN set -ex \
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 00000000..7d63976b
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,28 @@
+[metadata]
+name = promenade
+summary = 'Promenade is a tool for bootstrapping a resilient '
+          'Kubernetes cluster and managing its life-cycle via '
+          'Helm charts.
+description-file = README.md
+author = The Airship Authors
+home-page = https://github.com/openstack/airship-promenade
+
+classifier =
+    Intended Audience :: Information Technology
+    Intended Audience :: System Administrators
+    License :: OSI Approved :: Apache Software License
+    Operating System :: POSIX :: Linux
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
+
+[files]
+packages =
+    promenade
+data_files =
+    schemas = schemas/*
+    templates = templates/*
+
+[entry_points]
+console_scripts =
+    promenade=promenade.cli:promenade
diff --git a/setup.py b/setup.py
index de6c01cf..d306afbe 100644
--- a/setup.py
+++ b/setup.py
@@ -17,20 +17,6 @@
 from setuptools import setup
 
 setup(
-    setup_requires=['setuptools>=17.1'],
-    name='promenade',
-    version='0.8.0',
-    packages=['promenade'],
-    description=('Promenade is a tool for bootstrapping a resilient '
-                 'Kubernetes cluster and managing its life-cycle via Helm charts.'),
-    url='https://github.com/openstack/airship-promenade',
-    author='The Airship Authors',
-    license='Apache 2.0',
-    package_data={
-        'schemas': 'schemas/*',
-        'templates': 'templates/*',
-    },
-    entry_points={
-        'console_scripts': 'promenade=promenade.cli:promenade',
-    },
+    setup_requires=['setuptools>=17.1', 'pbr>=2.0.0'],
+    pbr=True
 )
diff --git a/test-requirements.txt b/test-requirements.txt
index 7c086efe..8325e7c9 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,5 +1,5 @@
 pytest
-flake8>=3.3.0
+flake8==2.6.2
 bandit>=1.5
 yapf==0.24.0
 sphinx>=1.6.2