openstack
/
kuryr-libnetwork
Code Issues Proposed changes

The kuryr default port has changed from 2377/2375 to 23750, we also need 

to change it in all file.

Closed-Bug: #1603777

Change-Id: Ia7f55e64c3c6d7d988a5e698ada0a1406e920d65
This commit is contained in:
Liping Mao 2016-07-12 07:34:55 +08:00
parent fb5e6d9b82
commit ad75de7ea4
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/docker/libnetwork/run_kuryr.sh
View File

@ -10,7 +10,7 @@ EOF
/usr/sbin/uwsgi \
--plugin /usr/lib/uwsgi/python \
--http-socket :2377 \
--http-socket :23750 \
-w kuryr.server:app \
--master \
--processes "$PROCESSES" \

2
contrib/vagrant/config/kuryr_rc
View File

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

2
devstack/settings
View File

@ -18,5 +18,5 @@ KURYR_CONFIG=${KURYR_CONFIG_DIR}/${KURYR_CONFIG_FILENAME}
KURYR_POOL_PREFIX=${KURYR_POOL_PREFIX:-10.10.0.0/16}
KURYR_POOL_PREFIX_LEN=${KURYR_POOL_PREFIX_LEN:-24}
KURYR_DOCKER_ENGINE_PORT=${KURYR_DOCKER_ENGINE_PORT:-2375}
KURYR_DOCKER_ENGINE_PORT=${KURYR_DOCKER_ENGINE_PORT:-23750}
KURYR_ETCD_PORT=${KURYR_ETCD_PORT:-4001}

2
kuryr_libnetwork/tests/fullstack/kuryr_base.py
View File

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

2
rally-jobs/plugins/scenarios/utils.py
View File

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