Re-enable the n-cauth required service for stable/queens|pike|ocata
n-cauth serviec has been remvoed from nvoa in Ussuri and that is why it was removed from default services[1]. But that is requried for stable/queens|pike|ocata which still depends on text-matrix for ENABLED_SERVICES. Since stable/rocky we have migrated the service enable in devstack base job[2]. This commit fix the Tempest master and stable/queens|pike|ocata gate by re-enable the n-cauth service for listed stable branches only. Later we can discuss to remove the test-matrix dependency for these branches also. Related-Bug: 1858666 [1] https://review.opendev.org/#/c/700217/ [2] https://review.opendev.org/#/c/546765/ Change-Id: Ia85ea5d338f07cb248f60de44b21826862d09d26
This commit is contained in:
parent
183a58eab1
commit
cdb438afb0
|
@ -98,6 +98,12 @@ primary:
|
|||
nova:
|
||||
base:
|
||||
services: [n-api, n-cond, n-cpu, n-novnc, n-sch, n-api-meta]
|
||||
queens:
|
||||
services: [n-cauth]
|
||||
pike:
|
||||
services: [n-cauth]
|
||||
ocata:
|
||||
services: [n-cauth]
|
||||
|
||||
nova-cells:
|
||||
base:
|
||||
|
|
|
@ -84,8 +84,11 @@ def calc_services(branch, features, configs, role):
|
|||
feature, add_services)
|
||||
services.update(add_services)
|
||||
if branch in grid_feature:
|
||||
services.update(
|
||||
grid_feature[branch].get('services', []))
|
||||
update_services = grid_feature[branch].get('services', [])
|
||||
if update_services:
|
||||
LOG.debug('Updating branch: %s specific services for '
|
||||
'feature %s: %s', branch, feature, update_services)
|
||||
services.update(update_services)
|
||||
|
||||
# deletes always trump adds
|
||||
for feature in features:
|
||||
|
|
Loading…
Reference in New Issue