From 5f47eebdc8d286270483373d2f4c7b2dfb7af017 Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Mon, 13 Mar 2017 16:04:14 -0600
Subject: [PATCH] Align stars to fix CI

1) Add bindep support

Bindep is an automation tool used by openstack-infra to bootstrap a
worker with default packages. By default if not defined, we inherit
the infra extra packages (which can include EPEL).

2) Disable dib-lint due to breakage caused by 2.0.0

Related-Bug: #1672730

Change-Id: Ia51a8c37f8acbed18c01ffb4413a4374811213be
(cherry picked from commit a9e2873d968b14c6e3e73b837f9d38445a329966)
---
 bindep.txt | 0
 tox.ini    | 3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 bindep.txt

diff --git a/bindep.txt b/bindep.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/tox.ini b/tox.ini
index ec8ab7fd9..2269e72c4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,7 +25,8 @@ whitelist_externals =
 commands =
     flake8
     bash -c "find scripts -type f | xargs bashate -v -iE006"
-    dib-lint
+# TODO(aschultz): re-enable dib-lint once LP#1672730 is fixed
+#    dib-lint
 
 [testenv:cover]
 commands = python setup.py test --coverage --coverage-package-name=instack_undercloud --testr-args='{posargs}'