summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.zuul.yaml20
-rw-r--r--devstack/lib/stx-fault6
-rw-r--r--devstack/settings7
3 files changed, 17 insertions, 16 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index 91d6068..a94604b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -39,7 +39,7 @@
39# This job is to begin testing a DevStack run here 39# This job is to begin testing a DevStack run here
40- job: 40- job:
41 name: stx-devstack-base 41 name: stx-devstack-base
42 nodeset: openstack-single-node-xenial 42 nodeset: openstack-single-node-bionic
43 parent: devstack 43 parent: devstack
44 description: | 44 description: |
45 Base job for StarlingX DevStack tests 45 Base job for StarlingX DevStack tests
@@ -48,19 +48,12 @@
48 timeout: 9000 48 timeout: 9000
49 required-projects: 49 required-projects:
50 - name: git.openstack.org/openstack-dev/devstack 50 - name: git.openstack.org/openstack-dev/devstack
51 override-branch: stable/pike 51# - name: git.openstack.org/openstack/cinder
52 - name: git.openstack.org/openstack/cinder 52# - name: git.openstack.org/openstack/glance
53 override-branch: stable/pike
54 - name: git.openstack.org/openstack/glance
55 override-branch: stable/pike
56 - name: git.openstack.org/openstack/keystone 53 - name: git.openstack.org/openstack/keystone
57 override-branch: stable/pike 54# - name: git.openstack.org/openstack/neutron
58 - name: git.openstack.org/openstack/neutron 55# - name: git.openstack.org/openstack/nova
59 override-branch: stable/pike
60 - name: git.openstack.org/openstack/nova
61 override-branch: stable/pike
62 - name: git.openstack.org/openstack/requirements 56 - name: git.openstack.org/openstack/requirements
63 override-branch: stable/pike
64 vars: 57 vars:
65 devstack_services: 58 devstack_services:
66 ceilometer-acentral: false 59 ceilometer-acentral: false
@@ -81,7 +74,8 @@
81 mysql: false 74 mysql: false
82 postgresql: true 75 postgresql: true
83 devstack_localrc: 76 devstack_localrc:
84 LIBS_FROM_GIT: cinder,glance,keystone,neutron,nova 77 # LIBS_FROM_GIT: cinder,glance,keystone,neutron,nova
78 LIBS_FROM_GIT: keystone
85 FORCE: yes 79 FORCE: yes
86 80
87- job: 81- job:
diff --git a/devstack/lib/stx-fault b/devstack/lib/stx-fault
index 57dcb24..2a04343 100644
--- a/devstack/lib/stx-fault
+++ b/devstack/lib/stx-fault
@@ -238,7 +238,7 @@ function install_fault {
238 if is_service_enabled fm-mgr; then 238 if is_service_enabled fm-mgr; then
239 install_fm_mgr 239 install_fm_mgr
240 fi 240 fi
241 if is_service_enabled fm-rest-api; then 241 if is_service_enabled fm-rest-api && is_service_enabled stx-config; then
242 install_fm_rest_api 242 install_fm_rest_api
243 fi 243 fi
244} 244}
@@ -341,13 +341,13 @@ function install_fm_rest_api {
341} 341}
342 342
343function start_fault { 343function start_fault {
344 if is_service_enabled fm-api; then 344 if is_service_enabled fm-rest-api; then
345 run_process fm-api "$STX_BIN_DIR/fm-api --config-file $FM_RESTAPI_CONF" 345 run_process fm-api "$STX_BIN_DIR/fm-api --config-file $FM_RESTAPI_CONF"
346 fi 346 fi
347} 347}
348 348
349function stop_fault { 349function stop_fault {
350 if is_service_enabled fm-api; then 350 if is_service_enabled fm-rest-api; then
351 stop_process fm_api 351 stop_process fm_api
352 fi 352 fi
353} 353}
diff --git a/devstack/settings b/devstack/settings
index 643b550..a081308 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -17,6 +17,13 @@ STX_FAULT_NAME=stx-fault
17######### Plugin Specific ########## 17######### Plugin Specific ##########
18enable_service $STX_FAULT_NAME 18enable_service $STX_FAULT_NAME
19 19
20# Circular dependencies are fun!
21# fm-rest-api has an undeclared dependency on cgtsclient from stx-config
22# so if that is not present we can't install it
23if ! is_service_enabled stx-config; then
24 disable_service fm-rest-api
25fi
26# but fm-rest-api has its own (declared!) external dependencies too
20if is_service_enabled fm-rest-api; then 27if is_service_enabled fm-rest-api; then
21 enable_service tsconfig 28 enable_service tsconfig
22fi 29fi