From 269704c119940fbbc18e275396770e1e591350f0 Mon Sep 17 00:00:00 2001 From: Ken'ichi Ohmichi Date: Sun, 1 May 2016 07:22:34 -0700 Subject: [PATCH] Remove NOVA_V2_LEGACY option There are two implementation code for similar API in Nova repository. One is newer: v2.1 API, another is legacy: v2 API. v2.1 API has been used as the default API since Liberty and legacy v2 API has been marked as deprecated. We have used and tested v2.1 API so well and now is nice time to remove legacy API code based on the consensus of the design summit of Austin. This patch removes NOVA_V2_LEGACY which set up legacy API code. NOTE: The gate job which uses this NOVA_V2_LEGACY option has been removed already since Iac81b7d569b76b99e9d86eaa5001ae7f9b78cdfe. Partially implements blueprint remove-legacy-v2-api-code Change-Id: I0e16b7ce608d7eeb3a35fd77e66531dfc8c142ef --- lib/nova | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/lib/nova b/lib/nova index 818ecc4f1b..7c145f8be5 100644 --- a/lib/nova +++ b/lib/nova @@ -59,11 +59,6 @@ NOVA_API_DB=${NOVA_API_DB:-nova_api} NOVA_API_PASTE_INI=${NOVA_API_PASTE_INI:-$NOVA_CONF_DIR/api-paste.ini} -# NOVA_V2_LEGACY defines whether we force the Nova v2.0 enpoint onto -# the Nova v2.0 legacy code base. Remove this option once the Nova -# v2.0 legacy codebase is removed. -NOVA_V2_LEGACY=$(trueorfalse False NOVA_V2_LEGACY) - if is_suse; then NOVA_WSGI_DIR=${NOVA_WSGI_DIR:-/srv/www/htdocs/nova} else @@ -311,13 +306,6 @@ function configure_nova { if [[ "$ENABLED_SERVICES" =~ "n-api" ]]; then # Get the sample configuration file in place cp $NOVA_DIR/etc/nova/api-paste.ini $NOVA_CONF_DIR - - # For setting up an environment where v2.0 is running on the - # v2.0 legacy code base. - if [[ "$NOVA_V2_LEGACY" == "True" ]]; then - sed -i s@"^/v2: openstack_compute_api_v21_legacy_v2_compatible$"@"/v2: openstack_compute_api_legacy_v2"@ \ - "$NOVA_API_PASTE_INI" - fi fi if is_service_enabled n-cpu; then