From e5a6f82e431bece62deb830257439b309b2921ec Mon Sep 17 00:00:00 2001 From: ghanshyam Date: Wed, 2 Sep 2015 13:19:48 +0900 Subject: [PATCH] Cleanup nova v2.1 API testing options Now gate will tests Nova v2.1 as default and separate jobs for v2 legacy and v2 compatible APIs - I86a627b8ec7b1246452a16c10dcfb1ad5f83bdef This commit cleanup the options used for old v2.1 jobs. Separate options are provided for Nova APIs testing- Ie6b7e4290d9a1d9789d04099b3b31c9a557bc22b Depends-On: Ie0430cedb7a8136c04b9fb7d08746293aab79f42 To remove old V2.1 jobs. Change-Id: Ibbed44e1c41ec1e6b3675317f08061810762796c --- lib/nova | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/lib/nova b/lib/nova index dcb4f13bd6..c0227c524f 100644 --- a/lib/nova +++ b/lib/nova @@ -56,13 +56,6 @@ NOVA_CELLS_DB=${NOVA_CELLS_DB:-nova_cell} NOVA_API_DB=${NOVA_API_DB:-nova_api} NOVA_API_PASTE_INI=${NOVA_API_PASTE_INI:-$NOVA_CONF_DIR/api-paste.ini} -# NOVA_API_VERSION valid options -# - default - setup API end points as nova does out of the box -# - v21default - make v21 the default on /v2 -# -# NOTE(sdague): this is for transitional testing of the Nova v21 API. -# Expect to remove in L or M. -NOVA_API_VERSION=${NOVA_API_VERSION-default} # 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 @@ -318,11 +311,6 @@ function configure_nova { # Get the sample configuration file in place cp $NOVA_DIR/etc/nova/api-paste.ini $NOVA_CONF_DIR - # For testing v21 is equivalent to v2 - if [[ "$NOVA_API_VERSION" == "v21default" ]]; then - sed -i s/": openstack_compute_api_v2$"/": openstack_compute_api_v21"/ "$NOVA_API_PASTE_INI" - fi - # For setting up an environment where v2.0 is running on the # v2.0 legacy code base. if [[ "$NOVA_V2_LEGACY" == "True" ]]; then