openstack
/
kuryr-libnetwork
Code Issues Proposed changes

Merge "Update plugin loading for devstack"

This commit is contained in:
Jenkins 2016-09-08 09:03:47 +00:00 committed by Gerrit Code Review
parent d30fef3a52 ca40ced2f8
commit 92b4afc101
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devstack/local.conf.sample
View File

@ -10,9 +10,6 @@ SERVICE_TOKEN=pass
ADMIN_PASSWORD=pass
enable_plugin kuryr-libnetwork https://git.openstack.org/openstack/kuryr-libnetwork
enable_service kuryr-libnetwork
enable_service etcd-server
enable_service docker-engine
# Use Neutron instead of nova-network
disable_service n-net

2
devstack/settings
View File

@ -18,3 +18,5 @@ KURYR_POOL_PREFIX_LEN=${KURYR_POOL_PREFIX_LEN:-24}
KURYR_DOCKER_ENGINE_PORT=${KURYR_DOCKER_ENGINE_PORT:-2375}
KURYR_ETCD_PORT=${KURYR_ETCD_PORT:-4001}
enable_service kuryr-libnetwork etcd-server docker-engine