Merge pull request #327 from raphink/docker_puppetdb_default

Use puppetdb as PUPPETDB_HOST on Docker
This commit is contained in:
Mike Terzo
2017-01-05 15:31:31 -05:00
committed by GitHub
2 changed files with 2 additions and 2 deletions

View File

@@ -1,6 +1,6 @@
import os
PUPPETDB_HOST = os.getenv('PUPPETDB_HOST', 'localhost')
PUPPETDB_HOST = os.getenv('PUPPETDB_HOST', 'puppetdb')
PUPPETDB_PORT = int(os.getenv('PUPPETDB_PORT', '8080'))
# Since this is an env it will alwas be a string, we need
# to conver that string to a bool

View File

@@ -25,7 +25,7 @@ class DockerTestCase(unittest.TestCase):
reload(docker_settings)
def test_default_host_port(self):
self.assertEqual(docker_settings.PUPPETDB_HOST, 'localhost')
self.assertEqual(docker_settings.PUPPETDB_HOST, 'puppetdb')
self.assertEqual(docker_settings.PUPPETDB_PORT, 8080)
def test_set_host_port(self):