Switch to using pypuppetdb 0.1.0.

This commit is contained in:
Daniele Sluijters
2014-01-13 13:11:18 +01:00
parent cbb3b8640f
commit d92a068057
4 changed files with 3 additions and 6 deletions

View File

@@ -8,9 +8,6 @@ functionality of `Puppet Dashboard`_.
Puppetboard relies on the `pypuppetdb`_ library to fetch data from PuppetDB Puppetboard relies on the `pypuppetdb`_ library to fetch data from PuppetDB
and is built with the help of the `Flask`_ microframework. and is built with the help of the `Flask`_ microframework.
**Note**: As of the 28th of October the master branch and the upcoming 0.0.3 release
require PuppetDB 1.5 / API v3.
.. _pypuppetdb: https://pypi.python.org/pypi/pypuppetdb .. _pypuppetdb: https://pypi.python.org/pypi/pypuppetdb
.. _PuppetDB: http://docs.puppetlabs.com/puppetdb/latest/index.html .. _PuppetDB: http://docs.puppetlabs.com/puppetdb/latest/index.html
.. _Puppet Dashboard: http://docs.puppetlabs.com/dashboard/ .. _Puppet Dashboard: http://docs.puppetlabs.com/dashboard/

View File

@@ -33,7 +33,7 @@ puppetdb = connect(
api_version=3, api_version=3,
host=app.config['PUPPETDB_HOST'], host=app.config['PUPPETDB_HOST'],
port=app.config['PUPPETDB_PORT'], port=app.config['PUPPETDB_PORT'],
ssl_verify=app.config['PUPPETDB_SSL'], ssl_verify=app.config['PUPPETDB_SSL_VERIFY'],
ssl_key=app.config['PUPPETDB_KEY'], ssl_key=app.config['PUPPETDB_KEY'],
ssl_cert=app.config['PUPPETDB_CERT'], ssl_cert=app.config['PUPPETDB_CERT'],
timeout=app.config['PUPPETDB_TIMEOUT'],) timeout=app.config['PUPPETDB_TIMEOUT'],)

View File

@@ -1,6 +1,6 @@
PUPPETDB_HOST = 'localhost' PUPPETDB_HOST = 'localhost'
PUPPETDB_PORT = 8080 PUPPETDB_PORT = 8080
PUPPETDB_SSL = False PUPPETDB_SSL_VERIFY = True
PUPPETDB_KEY = None PUPPETDB_KEY = None
PUPPETDB_CERT = None PUPPETDB_CERT = None
PUPPETDB_TIMEOUT = 20 PUPPETDB_TIMEOUT = 20

View File

@@ -5,5 +5,5 @@ MarkupSafe==0.18
WTForms==1.0.4 WTForms==1.0.4
Werkzeug==0.9.3 Werkzeug==0.9.3
itsdangerous==0.22 itsdangerous==0.22
git+git://github.com/nedap/pypuppetdb.git#egg=pypuppetdb pypuppetdb==0.1.0
requests==1.2.3 requests==1.2.3