openstack/zun
Code Issues Proposed changes

Merge "Enable plugin in target branch"

Browse Source
This commit is contained in:
Zuul 2018-12-11 03:45:31 +00:00 committed by Gerrit Code Review
commit 0d23f9b96b
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/vagrant/config/localrc
View File

@ -4,12 +4,12 @@ RABBIT_PASSWORD=password
SERVICE_TOKEN=password
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
enable_plugin kuryr-libnetwork https://git.openstack.org/openstack/kuryr-libnetwork
enable_plugin devstack-plugin-container https://git.openstack.org/openstack/devstack-plugin-container $TARGET_BRANCH
enable_plugin zun https://git.openstack.org/openstack/zun $TARGET_BRANCH
enable_plugin kuryr-libnetwork https://git.openstack.org/openstack/kuryr-libnetwork $TARGET_BRANCH
#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 $TARGET_BRANCH
#Uncomment below variables and enable nova and neutron
#services to use nova docker driver

10
devstack/local.conf.sample
View File

@ -5,24 +5,24 @@ RABBIT_PASSWORD=password
SERVICE_TOKEN=password
SERVICE_PASSWORD=password
ADMIN_PASSWORD=password
enable_plugin zun https://git.openstack.org/openstack/zun
enable_plugin zun https://git.openstack.org/openstack/zun $TARGET_BRANCH
enable_plugin zun-tempest-plugin https://git.openstack.org/openstack/zun-tempest-plugin
#This below plugin enables installation of container engine on Devstack.
#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 $TARGET_BRANCH
# 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_PROCESS_EXTERNAL_CONNECTIVITY=False
enable_plugin kuryr-libnetwork https://git.openstack.org/openstack/kuryr-libnetwork
enable_plugin kuryr-libnetwork https://git.openstack.org/openstack/kuryr-libnetwork $TARGET_BRANCH
# install python-zunclient from git
LIBS_FROM_GIT="python-zunclient"
# 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 $TARGET_BRANCH
# Optional: uncomment to enable the Heat plugin for container orchestration
# enable_plugin heat https://git.openstack.org/openstack/heat
# enable_plugin heat https://git.openstack.org/openstack/heat $TARGET_BRANCH

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

@ -5,12 +5,12 @@ RABBIT_PASSWORD=password
SERVICE_TOKEN=password
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
enable_plugin devstack-plugin-container https://git.openstack.org/openstack/devstack-plugin-container $TARGET_BRANCH
enable_plugin zun https://git.openstack.org/openstack/zun $TARGET_BRANCH
KURYR_CAPABILITY_SCOPE=global
KURYR_PROCESS_EXTERNAL_CONNECTIVITY=False
enable_plugin kuryr-libnetwork https://git.openstack.org/openstack/kuryr-libnetwork
enable_plugin kuryr-libnetwork https://git.openstack.org/openstack/kuryr-libnetwork $TARGET_BRANCH
# Following is for multi host settings
MULTI_HOST=True