Browse Source

tempest: Disable Nova in devstack

The patch [1] introduced a new bug where devstack fails if nova is
enabled and glance disabled. As we don't need either of those, try to
disable nova.

As we no longer have nova API, we use Neutron agent API instead for
obtaining name of the host.

[1] http://git.openstack.org/cgit/openstack-dev/devstack/commit/?id=23d33a8b

Change-Id: I4af0758f58a93ed13da99e04a891ecfb5d339a3e
changes/82/631482/6
Jakub Libosvar 5 months ago
parent
commit
541a160588
3 changed files with 22 additions and 3 deletions
  1. 9
    1
      devstack/plugin.sh
  2. 3
    2
      net_ansible_tempest/tests/scenario/test_basic_ops.py
  3. 10
    0
      zuul.d/jobs.yaml

+ 9
- 1
devstack/plugin.sh View File

@@ -28,7 +28,15 @@ function ansible_workarounds {
28 28
 }
29 29
 
30 30
 function pre_install {
31
-    :
31
+    # REVISIT(jlibosva): Ubuntu boxes use mawk by default which has a slightly
32
+    #                    different syntax than gawk.  mawk fails when merging
33
+    #                    local.conf with openstack config files.  gawk is a
34
+    #                    requirement of nova and when devstack is used without
35
+    #                    nova, gawk is not installed and the whole devstack
36
+    #                    deployment fails.  The real fix should go to devstack
37
+    #                    repository but until it's fixed there, we have this
38
+    #                    workarond to unblock the CI.
39
+    install_package gawk
32 40
 }
33 41
 
34 42
 

+ 3
- 2
net_ansible_tempest/tests/scenario/test_basic_ops.py View File

@@ -66,8 +66,9 @@ class TestWithOvs(base.NetAnsibleAdminBaseTest):
66 66
             network_id=network_id, name=self.ovs_port_name)['port']
67 67
         self.addCleanup(self.cleanup_port, port['id'])
68 68
 
69
-        host = self.os_admin.hypervisor_client.list_hypervisors(
70
-            )['hypervisors'][0]['hypervisor_hostname']
69
+        host = self.admin_agents_client.list_agents(
70
+            agent_type='Open vSwitch agent'
71
+        )['agents'][0]['host']
71 72
 
72 73
         update_args = {
73 74
             'device_owner': 'baremetal:none',

+ 10
- 0
zuul.d/jobs.yaml View File

@@ -44,6 +44,16 @@
44 44
       devstack_plugins:
45 45
         networking-ansible: git://git.openstack.org/openstack/networking-ansible.git
46 46
       devstack_services:
47
+        # Nova services
48
+        nova: false
49
+        n-api: false
50
+        n-api-meta: false
51
+        n-novnc: false
52
+        n-cond: false
53
+        n-cpu: false
54
+        n-obj: false
55
+        n-sch: false
56
+        n-cauth: false
47 57
         # Glance services
48 58
         g-api: false
49 59
         g-reg: false

Loading…
Cancel
Save