From 49e7ba7f82d11776a86a5edfd9c11a0929e4abf0 Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Wed, 17 Feb 2016 10:14:53 +0000
Subject: [PATCH] Fixup checks for neutron section in nova.conf

---
 tests/basic_deployment.py | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index 1f1ceaf8..d60fda47 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -878,16 +878,29 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
             expected['oslo_concurrency'] = {
                 'lock_path': '/var/lock/nova'
             }
-            expected['neutron'] = {
-                'auth_strategy': 'keystone',
-                'url': nova_cc_relation['quantum_url'],
-                'admin_tenant_name': 'services',
-                'admin_username': 'nova',
-                'admin_password': nova_cc_relation['service_password'],
-                'admin_auth_url': ep,
-                'service_metadata_proxy': 'True',
-                'metadata_proxy_shared_secret': u.not_null
-            }
+            if self._get_openstack_release() >= self.trusty_mitaka:
+                expected['neutron'] = {
+                    'url': nova_cc_relation['quantum_url'],
+                    'auth_plugin': 'password',
+                    'project_name': 'services',
+                    'username': 'nova',
+                    'password': nova_cc_relation['service_password'],
+                    'auth_url': ep,
+                    'region': 'RegionOne',
+                    'service_metadata_proxy': 'True',
+                    'metadata_proxy_shared_secret': u.not_null
+                }
+            else:
+                expected['neutron'] = {
+                    'auth_strategy': 'keystone',
+                    'url': nova_cc_relation['quantum_url'],
+                    'admin_tenant_name': 'services',
+                    'admin_username': 'nova',
+                    'admin_password': nova_cc_relation['service_password'],
+                    'admin_auth_url': ep,
+                    'service_metadata_proxy': 'True',
+                    'metadata_proxy_shared_secret': u.not_null
+                }
         else:
             # Juno or earlier
             expected['DEFAULT'].update({