From ad75de7ea49e851f043304ad6dad8c37ee758c1f Mon Sep 17 00:00:00 2001 From: Liping Mao Date: Tue, 12 Jul 2016 07:34:55 +0800 Subject: [PATCH] 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 --- contrib/docker/libnetwork/run_kuryr.sh | 2 +- contrib/vagrant/config/kuryr_rc | 2 +- devstack/settings | 2 +- kuryr_libnetwork/tests/fullstack/kuryr_base.py | 2 +- rally-jobs/plugins/scenarios/utils.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/docker/libnetwork/run_kuryr.sh b/contrib/docker/libnetwork/run_kuryr.sh index 07d6adf3..c03fe05c 100755 --- a/contrib/docker/libnetwork/run_kuryr.sh +++ b/contrib/docker/libnetwork/run_kuryr.sh @@ -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" \ diff --git a/contrib/vagrant/config/kuryr_rc b/contrib/vagrant/config/kuryr_rc index 507f294c..66aee85c 100644 --- a/contrib/vagrant/config/kuryr_rc +++ b/contrib/vagrant/config/kuryr_rc @@ -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" diff --git a/devstack/settings b/devstack/settings index bcad2307..d748576b 100644 --- a/devstack/settings +++ b/devstack/settings @@ -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} diff --git a/kuryr_libnetwork/tests/fullstack/kuryr_base.py b/kuryr_libnetwork/tests/fullstack/kuryr_base.py index 408683d2..af3099c0 100644 --- a/kuryr_libnetwork/tests/fullstack/kuryr_base.py +++ b/kuryr_libnetwork/tests/fullstack/kuryr_base.py @@ -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() diff --git a/rally-jobs/plugins/scenarios/utils.py b/rally-jobs/plugins/scenarios/utils.py index 6a35415c..1a285e2b 100644 --- a/rally-jobs/plugins/scenarios/utils.py +++ b/rally-jobs/plugins/scenarios/utils.py @@ -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):