diff options
author | Peter Stachowski <peter@tesora.com> | 2016-08-23 16:41:28 +0000 |
---|---|---|
committer | Peter Stachowski <peter@tesora.com> | 2016-08-25 19:43:34 +0000 |
commit | c637e5ffc2a29dabbf17decb70f6b3a05ab4b8ae (patch) | |
tree | 4ac7e20f6d463ca925a70aba3eb33cd9f0bbf989 | |
parent | 405a3b5452d9491afa465bce70ca29c4ca09a835 (diff) | |
download | trove-integration-c637e5ffc2a29dabbf17decb70f6b3a05ab4b8ae.tar.gz |
Turn off Neutron until supporting changes land
There are a number of changesets that need to be merged
before Trove can use Neutron successfully. Since two
of these are in devstack we'll need to wait to see if they
are willing to accept the changes before we can start using
it by default.
See: https://review.openstack.org/#/c/356026
https://review.openstack.org/#/c/356763
https://review.openstack.org/#/c/356701
Note that the 2nd changeset (devstack) could be rolled into the
Trove plugin (3rd changeset) by copying the relevant functions
(not ideal, but doable) however the 1st changeset (devstack) is
fairly critical and would be difficult to implement outside
the devstack Neutron l3 plugin.
Also changed the logic for the Neutron client (and others)
such that the code is pulled from git if the project is enabled,
and made sure *_BRANCH and PROJECT_BRANCH were honoured on the plugins.
Change-Id: I764f15514a40926173b6c9194ddbf24c6c1f999a
-rw-r--r-- | scripts/localrc.rc | 24 | ||||
-rw-r--r-- | scripts/redstack.rc | 7 |
2 files changed, 24 insertions, 7 deletions
diff --git a/scripts/localrc.rc b/scripts/localrc.rc index 8549373..94c598e 100644 --- a/scripts/localrc.rc +++ b/scripts/localrc.rc @@ -30,28 +30,39 @@ fi if [[ $ENABLE_CEILOMETER = true ]] || [[ $ENABLE_PROFILER = true ]]; then CEILOMETER_BACKEND=mysql CEILOMETER_NOTIFICATION_TOPICS=notifications,profiler - enable_plugin ceilometer ${GIT_OPENSTACK}/ceilometer.git + PROJ_BRANCH=$(get_project_branch CEILOMETER_BRANCH $PROJECT_BRANCH) + enable_plugin ceilometer ${GIT_OPENSTACK}/ceilometer.git $PROJ_BRANCH fi # Enable Mistral, if configured if [[ $ENABLE_MISTRAL = true ]]; then - enable_plugin mistral ${GIT_OPENSTACK}/mistral.git + PROJ_BRANCH=$(get_project_branch MISTRAL_BRANCH $PROJECT_BRANCH) + enable_plugin mistral ${GIT_OPENSTACK}/mistral.git $PROJ_BRANCH fi # Use Git repositories for client components LIBS_FROM_GIT=python-troveclient if [[ $LIBS_FROM_GIT_ALL_CLIENTS = true ]]; then - LIBS_FROM_GIT+=,python-ceilometerclient,python-cinderclient - LIBS_FROM_GIT+=,python-glanceclient,python-heatclient + LIBS_FROM_GIT+=,python-ceilometerclient + LIBS_FROM_GIT+=,python-cinderclient + LIBS_FROM_GIT+=,python-glanceclient + LIBS_FROM_GIT+=,python-heatclient LIBS_FROM_GIT+=,python-keystoneclient + LIBS_FROM_GIT+=,python-mistralclient + LIBS_FROM_GIT+=,python-neutronclient + LIBS_FROM_GIT+=,python-novaclient + LIBS_FROM_GIT+=,python-openstackclient + LIBS_FROM_GIT+=,python-swiftclient +else if [[ $ENABLE_NEUTRON = true ]]; then LIBS_FROM_GIT+=,python-neutronclient fi if [[ $ENABLE_MISTRAL = true ]]; then LIBS_FROM_GIT+=,python-mistralclient fi - LIBS_FROM_GIT+=,python-novaclient,python-openstackclient - LIBS_FROM_GIT+=,python-swiftclient + if [[ $ENABLE_CEILOMETER = true ]]; then + LIBS_FROM_GIT+=,python-ceilometerclient + fi fi # Add Git repositories for libraries if [[ $LIBS_FROM_GIT_ALL_OSLO = true ]]; then @@ -86,3 +97,4 @@ VOLUME_BACKING_FILE_SIZE=${VOLUME_BACKING_FILE_SIZE} # to force lock_path to /tmp. EXTRA_OPTS=(lock_path=$USERHOME/nova_locks rescan_timeout=180 resizefs_timeout=240 force_dhcp_release=False) UNDO_REQUIREMENTS=False + diff --git a/scripts/redstack.rc b/scripts/redstack.rc index 4207d28..b4036ba 100644 --- a/scripts/redstack.rc +++ b/scripts/redstack.rc @@ -11,7 +11,12 @@ REGION_NAME=${REGION_NAME:-${OS_REGION_NAME:-RegionOne}} # Enable neutron instead of nova-network -NEUTRON_DEFAULT=true +# Note: Until a few key changesets land, we can't enable Neutron properly. +# See: https://review.openstack.org/#/c/356026 +# https://review.openstack.org/#/c/356763 +# https://review.openstack.org/#/c/356701 +# NEUTRON_DEFAULT=true +NEUTRON_DEFAULT=false if [[ $BRANCH_OVERRIDE == "stable/liberty" || $BRANCH_OVERRIDE == "stable/mitaka" ]]; then NEUTRON_DEFAULT=false fi |