summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Libosvar <libosvar@redhat.com>2019-01-17 13:28:30 +0100
committerJakub Libosvar <libosvar@redhat.com>2019-01-18 11:29:57 +0000
commit541a16058821b964a0973658cb951506da276869 (patch)
tree33b6ef38835535c087685c1ba4b86bf180f3c881
parent296949631440d0f5b6dc0566516f916fe91a58fe (diff)
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
Notes
Notes (review): Code-Review+2: Dan Radez <dradez@redhat.com> Workflow+1: Dan Radez <dradez@redhat.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 18 Jan 2019 12:36:53 +0000 Reviewed-on: https://review.openstack.org/631482 Project: openstack/networking-ansible Branch: refs/heads/master
-rw-r--r--devstack/plugin.sh10
-rw-r--r--net_ansible_tempest/tests/scenario/test_basic_ops.py5
-rw-r--r--zuul.d/jobs.yaml10
3 files changed, 22 insertions, 3 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index ad705c8..d5c3ae4 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -28,7 +28,15 @@ function ansible_workarounds {
28} 28}
29 29
30function pre_install { 30function 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
diff --git a/net_ansible_tempest/tests/scenario/test_basic_ops.py b/net_ansible_tempest/tests/scenario/test_basic_ops.py
index 56fa441..3d1e908 100644
--- a/net_ansible_tempest/tests/scenario/test_basic_ops.py
+++ b/net_ansible_tempest/tests/scenario/test_basic_ops.py
@@ -66,8 +66,9 @@ class TestWithOvs(base.NetAnsibleAdminBaseTest):
66 network_id=network_id, name=self.ovs_port_name)['port'] 66 network_id=network_id, name=self.ovs_port_name)['port']
67 self.addCleanup(self.cleanup_port, port['id']) 67 self.addCleanup(self.cleanup_port, port['id'])
68 68
69 host = self.os_admin.hypervisor_client.list_hypervisors( 69 host = self.admin_agents_client.list_agents(
70 )['hypervisors'][0]['hypervisor_hostname'] 70 agent_type='Open vSwitch agent'
71 )['agents'][0]['host']
71 72
72 update_args = { 73 update_args = {
73 'device_owner': 'baremetal:none', 74 'device_owner': 'baremetal:none',
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index a7bfa75..fa450a4 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -44,6 +44,16 @@
44 devstack_plugins: 44 devstack_plugins:
45 networking-ansible: git://git.openstack.org/openstack/networking-ansible.git 45 networking-ansible: git://git.openstack.org/openstack/networking-ansible.git
46 devstack_services: 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 # Glance services 57 # Glance services
48 g-api: false 58 g-api: false
49 g-reg: false 59 g-reg: false