openstack/zun
Code Issues Proposed changes

Set capability_scope to global in devstack

Browse Source 
This will make multi-node devstack setup works properly.

Change-Id: Iaf4d90bc6ee605f75cdede510774bd2261944790
This commit is contained in:
Hongbin Lu 2017-12-02 03:43:32 +00:00
parent b49990d037
commit febd28ae8d
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devstack/local.conf.sample
View File

@ -12,6 +12,9 @@ enable_plugin zun-tempest-plugin https://git.openstack.org/openstack/zun-tempest
#The default container engine is Docker #The default container engine is Docker
enable_plugin devstack-plugin-container https://git.openstack.org/openstack/devstack-plugin-container 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 KURYR_ETCD_PORT=2379
enable_plugin kuryr-libnetwork https://git.openstack.org/openstack/kuryr-libnetwork enable_plugin kuryr-libnetwork https://git.openstack.org/openstack/kuryr-libnetwork

2
devstack/local.conf.subnode.sample
View File

@ -7,6 +7,8 @@ SERVICE_PASSWORD=password
ADMIN_PASSWORD=password ADMIN_PASSWORD=password
enable_plugin devstack-plugin-container https://git.openstack.org/openstack/devstack-plugin-container enable_plugin devstack-plugin-container https://git.openstack.org/openstack/devstack-plugin-container
enable_plugin zun https://git.openstack.org/openstack/zun enable_plugin zun https://git.openstack.org/openstack/zun
KURYR_CAPABILITY_SCOPE=global
enable_plugin kuryr-libnetwork https://git.openstack.org/openstack/kuryr-libnetwork enable_plugin kuryr-libnetwork https://git.openstack.org/openstack/kuryr-libnetwork
# Following is for multi host settings # Following is for multi host settings

6
playbooks/zun-devstack-base-multinode/run.yaml
View File

@ -31,11 +31,7 @@
[[local|localrc]] [[local|localrc]]
enable_plugin zun git://git.openstack.org/openstack/zun enable_plugin zun git://git.openstack.org/openstack/zun
LIBS_FROM_GIT="python-zunclient" LIBS_FROM_GIT="python-zunclient"
KURYR_CAPABILITY_SCOPE=global
[[post-config|$KURYR_CONFIG]]
[DEFAULT]
capability_scope = global
debug = True
EOF EOF
executable: /bin/bash executable: /bin/bash