Merge "Docker Daemon should use port 2375 instead of 23750 at some places"

This commit is contained in:
Jenkins 2016-09-08 08:54:16 +00:00 committed by Gerrit Code Review
commit d30fef3a52
3 changed files with 3 additions and 3 deletions

View File

@ -3,4 +3,4 @@ export SERVICE_PASSWORD=pass
export SERVICE_TENANT_NAME=admin export SERVICE_TENANT_NAME=admin
export SERVICE_TOKEN=pass export SERVICE_TOKEN=pass
export IDENTITY_URL=http://127.0.0.1:5000/v2.0 export IDENTITY_URL=http://127.0.0.1:5000/v2.0
export DOCKER_HOST="tcp://0.0.0.0:23750" export DOCKER_HOST="tcp://0.0.0.0:2375"

View File

@ -27,5 +27,5 @@ class KuryrBaseTest(base.BaseTestCase):
def setUp(self): def setUp(self):
super(KuryrBaseTest, self).setUp() super(KuryrBaseTest, self).setUp()
self.docker_client = docker.Client( self.docker_client = docker.Client(
base_url='tcp://0.0.0.0:23750') base_url='tcp://0.0.0.0:2375')
self.neutron_client = controllers.get_neutron_client() self.neutron_client = controllers.get_neutron_client()

View File

@ -27,7 +27,7 @@ class KuryrScenario(scenario.OpenStackScenario):
def __init__(self, context=None, admin_clients=None, clients=None): def __init__(self, context=None, admin_clients=None, clients=None):
super(KuryrScenario, self).__init__(context, admin_clients, clients) super(KuryrScenario, self).__init__(context, admin_clients, clients)
self.docker_client = docker.Client(base_url='tcp://0.0.0.0:23750') self.docker_client = docker.Client(base_url='tcp://0.0.0.0:2375')
@atomic.action_timer("kuryr.list_networks") @atomic.action_timer("kuryr.list_networks")
def _list_networks(self, network_list_args): def _list_networks(self, network_list_args):