From 795d243e9d998d917282371cbf5bac7c9f0e6d83 Mon Sep 17 00:00:00 2001 From: Daniele Sluijters Date: Mon, 28 Oct 2013 17:08:40 +0100 Subject: [PATCH] We now require PuppetDB 1.5 / API v3. PUPPETDB_API is no longer configurable since we're now using features that are v3 only. Limiting ourselves to v2 compatibility is far too troublesome and people tend to update to newer versions of PuppetDB fairly quickly. --- README.rst | 3 +++ puppetboard/app.py | 2 +- puppetboard/default_settings.py | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index a6d454d..1d62a34 100644 --- a/README.rst +++ b/README.rst @@ -8,6 +8,9 @@ functionality of `Puppet Dashboard`_. Puppetboard relies on the `pypuppetdb`_ library to fetch data from PuppetDB 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 .. _PuppetDB: http://docs.puppetlabs.com/puppetdb/latest/index.html .. _Puppet Dashboard: http://docs.puppetlabs.com/dashboard/ diff --git a/puppetboard/app.py b/puppetboard/app.py index e4bbc80..afe1311 100644 --- a/puppetboard/app.py +++ b/puppetboard/app.py @@ -27,7 +27,7 @@ app.config.from_envvar('PUPPETBOARD_SETTINGS', silent=True) app.secret_key = os.urandom(24) puppetdb = connect( - api_version=app.config['PUPPETDB_API'], + api_version=3, host=app.config['PUPPETDB_HOST'], port=app.config['PUPPETDB_PORT'], ssl=app.config['PUPPETDB_SSL'], diff --git a/puppetboard/default_settings.py b/puppetboard/default_settings.py index 0421bdd..5fab6ab 100644 --- a/puppetboard/default_settings.py +++ b/puppetboard/default_settings.py @@ -4,7 +4,6 @@ PUPPETDB_SSL=False PUPPETDB_KEY=None PUPPETDB_CERT=None PUPPETDB_TIMEOUT=20 -PUPPETDB_API=3 DEV_LISTEN_HOST='127.0.0.1' DEV_LISTEN_PORT=5000 UNRESPONSIVE_HOURS=2