starlingx/fault
Code Issues Proposed changes

Convert DevStack jobs to master & bionic

Browse Source 
We're changing to upstream master soon, let's start running
on the upstream devstack configuration.

There is an undeclared dependency on cgtsclient in fm-rest-api
so we need to work around that.

Change-Id: If764701fce94fb760edf0a68805753d3804892c0
Signed-off-by: Dean Troyer <dtroyer@gmail.com>
This commit is contained in:
Dean Troyer 2019-02-08 15:36:59 -06:00
parent d139b39fda
commit b217f4c87c
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.zuul.yaml
View File

@ -39,7 +39,7 @@
# This job is to begin testing a DevStack run here # This job is to begin testing a DevStack run here
- job: - job:
name: stx-devstack-base name: stx-devstack-base
nodeset: openstack-single-node-xenial nodeset: openstack-single-node-bionic
parent: devstack parent: devstack
description: | description: |
Base job for StarlingX DevStack tests Base job for StarlingX DevStack tests
@ -48,19 +48,12 @@
timeout: 9000 timeout: 9000
required-projects: required-projects:
- name: git.openstack.org/openstack-dev/devstack - name: git.openstack.org/openstack-dev/devstack
override-branch: stable/pike # - name: git.openstack.org/openstack/cinder
- name: git.openstack.org/openstack/cinder # - name: git.openstack.org/openstack/glance
override-branch: stable/pike
- name: git.openstack.org/openstack/glance
override-branch: stable/pike
- name: git.openstack.org/openstack/keystone - name: git.openstack.org/openstack/keystone
override-branch: stable/pike # - name: git.openstack.org/openstack/neutron
- name: git.openstack.org/openstack/neutron # - name: git.openstack.org/openstack/nova
override-branch: stable/pike
- name: git.openstack.org/openstack/nova
override-branch: stable/pike
- name: git.openstack.org/openstack/requirements - name: git.openstack.org/openstack/requirements
override-branch: stable/pike
vars: vars:
devstack_services: devstack_services:
ceilometer-acentral: false ceilometer-acentral: false
@ -81,7 +74,8 @@
mysql: false mysql: false
postgresql: true postgresql: true
devstack_localrc: devstack_localrc:
LIBS_FROM_GIT: cinder,glance,keystone,neutron,nova # LIBS_FROM_GIT: cinder,glance,keystone,neutron,nova
LIBS_FROM_GIT: keystone
FORCE: yes FORCE: yes
- job: - job:

6
devstack/lib/stx-fault
View File

@ -238,7 +238,7 @@ function install_fault {
if is_service_enabled fm-mgr; then if is_service_enabled fm-mgr; then
install_fm_mgr install_fm_mgr
fi fi
if is_service_enabled fm-rest-api; then if is_service_enabled fm-rest-api && is_service_enabled stx-config; then
install_fm_rest_api install_fm_rest_api
fi fi
} }
@ -341,13 +341,13 @@ function install_fm_rest_api {
} }
function start_fault { function start_fault {
if is_service_enabled fm-api; then if is_service_enabled fm-rest-api; then
run_process fm-api "$STX_BIN_DIR/fm-api --config-file $FM_RESTAPI_CONF" run_process fm-api "$STX_BIN_DIR/fm-api --config-file $FM_RESTAPI_CONF"
fi fi
} }
function stop_fault { function stop_fault {
if is_service_enabled fm-api; then if is_service_enabled fm-rest-api; then
stop_process fm_api stop_process fm_api
fi fi
} }

7
devstack/settings
View File

@ -17,6 +17,13 @@ STX_FAULT_NAME=stx-fault
######### Plugin Specific ########## ######### Plugin Specific ##########
enable_service $STX_FAULT_NAME enable_service $STX_FAULT_NAME
# Circular dependencies are fun!
# fm-rest-api has an undeclared dependency on cgtsclient from stx-config
# so if that is not present we can't install it
if ! is_service_enabled stx-config; then
disable_service fm-rest-api
fi
# but fm-rest-api has its own (declared!) external dependencies too
if is_service_enabled fm-rest-api; then if is_service_enabled fm-rest-api; then
enable_service tsconfig enable_service tsconfig
fi fi