From 7991d61804921cf143e8c8c990dd8f0f36f1df6b Mon Sep 17 00:00:00 2001
From: Craig Vyvial <cp16net@gmail.com>
Date: Tue, 8 Sep 2015 14:38:45 -0500
Subject: [PATCH] Revert the legacy_compute v2 api for nova

The related bugs are closed long-long time ago,
so this change tryes to remove the workaround added by the
reverted commit.

Related-Bug: #1493446
Related-Bug: #1491737

This reverts commit 5cc4f2ea82df311bb2fa906786f12d372addf230.

Change-Id: Ia56d3225ca4e29d239b4a792a08c081b3f0ac636
---
 devstack/plugin.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 25237ea2ef..da941eefd3 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -120,11 +120,6 @@ function configure_trove {
         iniset $TROVE_TASKMANAGER_CONF DEFAULT nova_proxy_admin_tenant_name trove
         iniset $TROVE_TASKMANAGER_CONF DEFAULT nova_proxy_admin_pass $RADMIN_USER_PASS
         iniset $TROVE_TASKMANAGER_CONF DEFAULT trove_auth_url $TROVE_AUTH_ENDPOINT
-
-        # TODO(cp16net) use the compute v2 api as default v2.1 is not working.
-        # https://bugs.launchpad.net/python-novaclient/+bug/1493446
-        iniset $TROVE_TASKMANAGER_CONF DEFAULT nova_compute_service_type compute_legacy
-
         setup_trove_logging $TROVE_TASKMANAGER_CONF
 
         # Increase default timeouts (required by the tests).