openstack/zun
Code Issues Proposed changes

Merge "Enable Kuryr-libnetwork in devstack"

Browse Source
This commit is contained in:
Jenkins 2017-03-06 03:26:01 +00:00 committed by Gerrit Code Review
commit d4e85c112c
4 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/vagrant/config/localrc
View File

@ -5,6 +5,7 @@ SERVICE_TOKEN=password
SERVICE_PASSWORD=password SERVICE_PASSWORD=password
ADMIN_PASSWORD=password ADMIN_PASSWORD=password
enable_plugin zun https://git.openstack.org/openstack/zun enable_plugin zun https://git.openstack.org/openstack/zun
enable_plugin kuryr-libnetwork http://git.openstack.org/openstack/kuryr-libnetwork
#Optional: uncomment to enable the Zun UI plugin in Horizon #Optional: uncomment to enable the Zun UI plugin in Horizon
#enable_plugin zun-ui https://git.openstack.org/openstack/zun-ui #enable_plugin zun-ui https://git.openstack.org/openstack/zun-ui

1
doc/source/dev/manual-devstack.rst
View File

@ -28,6 +28,7 @@ required OpenStack services::
SERVICE_TOKEN=password SERVICE_TOKEN=password
SERVICE_PASSWORD=password SERVICE_PASSWORD=password
ADMIN_PASSWORD=password ADMIN_PASSWORD=password
enable_plugin kuryr-libnetwork http://git.openstack.org/openstack/kuryr-libnetwork
END END
More devstack configuration information can be found at More devstack configuration information can be found at

1
doc/source/dev/quickstart.rst
View File

@ -87,6 +87,7 @@ required OpenStack services::
SERVICE_PASSWORD=password SERVICE_PASSWORD=password
ADMIN_PASSWORD=password ADMIN_PASSWORD=password
enable_plugin zun https://git.openstack.org/openstack/zun enable_plugin zun https://git.openstack.org/openstack/zun
enable_plugin kuryr-libnetwork http://git.openstack.org/openstack/kuryr-libnetwork
# Optional: uncomment to enable the Zun UI plugin in Horizon # Optional: uncomment to enable the Zun UI plugin in Horizon
# enable_plugin zun-ui https://git.openstack.org/openstack/zun-ui # enable_plugin zun-ui https://git.openstack.org/openstack/zun-ui

2
zun/tests/contrib/gate_hook.sh
View File

@ -21,6 +21,8 @@
driver=$1 driver=$1
db=$2 db=$2
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin kuryr-libnetwork http://git.openstack.org/openstack/kuryr-libnetwork"
if [ "$driver" = "docker" ]; then if [ "$driver" = "docker" ]; then
export DEVSTACK_LOCAL_CONFIG+=$'\n'"ZUN_DRIVER=docker" export DEVSTACK_LOCAL_CONFIG+=$'\n'"ZUN_DRIVER=docker"
elif [ "$driver" = "nova-docker" ]; then elif [ "$driver" = "nova-docker" ]; then