From 8f9fba6e670d7f81641888d571ee7aacc7b83b9b Mon Sep 17 00:00:00 2001 From: Hongbin Lu Date: Thu, 18 Oct 2018 03:36:08 +0000 Subject: [PATCH] Enable plugin in target branch By default, devstack will enable plugin in master branch. However, master branch might not be the branch we wanted. In particular, if we are using stable branch, we want devstack to enable plugin in stable branch instead of master branch. This commit modifies the sample local conf to explicitly specify the branch when enabling devstack plugin. Change-Id: I1ce148f50e4d091e959b5c0d5b1b6281a07db946 --- contrib/vagrant/config/localrc | 8 ++++---- devstack/local.conf.sample | 10 +++++----- devstack/local.conf.subnode.sample | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/contrib/vagrant/config/localrc b/contrib/vagrant/config/localrc index f95610cc2..065025a62 100644 --- a/contrib/vagrant/config/localrc +++ b/contrib/vagrant/config/localrc @@ -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 diff --git a/devstack/local.conf.sample b/devstack/local.conf.sample index c990b9e67..82047c3b2 100644 --- a/devstack/local.conf.sample +++ b/devstack/local.conf.sample @@ -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 diff --git a/devstack/local.conf.subnode.sample b/devstack/local.conf.subnode.sample index 748743923..41a6c2688 100644 --- a/devstack/local.conf.subnode.sample +++ b/devstack/local.conf.subnode.sample @@ -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