From febd28ae8dc37d13fd8a460e5cd57a54eefaf77a Mon Sep 17 00:00:00 2001 From: Hongbin Lu Date: Sat, 2 Dec 2017 03:43:32 +0000 Subject: [PATCH] Set capability_scope to global in devstack This will make multi-node devstack setup works properly. Change-Id: Iaf4d90bc6ee605f75cdede510774bd2261944790 --- devstack/local.conf.sample | 3 +++ devstack/local.conf.subnode.sample | 2 ++ playbooks/zun-devstack-base-multinode/run.yaml | 6 +----- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/devstack/local.conf.sample b/devstack/local.conf.sample index 1f8f4acf1..77024663f 100644 --- a/devstack/local.conf.sample +++ b/devstack/local.conf.sample @@ -12,6 +12,9 @@ enable_plugin zun-tempest-plugin https://git.openstack.org/openstack/zun-tempest #The default container engine is Docker enable_plugin devstack-plugin-container https://git.openstack.org/openstack/devstack-plugin-container +# In Kuryr, KURYR_CAPABILITY_SCOPE is `local` by default, +# but we must change it to `global` in the multinode scenario. +KURYR_CAPABILITY_SCOPE=global KURYR_ETCD_PORT=2379 enable_plugin kuryr-libnetwork https://git.openstack.org/openstack/kuryr-libnetwork diff --git a/devstack/local.conf.subnode.sample b/devstack/local.conf.subnode.sample index 1bf72ac03..422fa7d50 100644 --- a/devstack/local.conf.subnode.sample +++ b/devstack/local.conf.subnode.sample @@ -7,6 +7,8 @@ SERVICE_PASSWORD=password ADMIN_PASSWORD=password enable_plugin devstack-plugin-container https://git.openstack.org/openstack/devstack-plugin-container enable_plugin zun https://git.openstack.org/openstack/zun + +KURYR_CAPABILITY_SCOPE=global enable_plugin kuryr-libnetwork https://git.openstack.org/openstack/kuryr-libnetwork # Following is for multi host settings diff --git a/playbooks/zun-devstack-base-multinode/run.yaml b/playbooks/zun-devstack-base-multinode/run.yaml index 987930e50..9cd705060 100644 --- a/playbooks/zun-devstack-base-multinode/run.yaml +++ b/playbooks/zun-devstack-base-multinode/run.yaml @@ -31,11 +31,7 @@ [[local|localrc]] enable_plugin zun git://git.openstack.org/openstack/zun LIBS_FROM_GIT="python-zunclient" - - [[post-config|$KURYR_CONFIG]] - [DEFAULT] - capability_scope = global - debug = True + KURYR_CAPABILITY_SCOPE=global EOF executable: /bin/bash