Add missing update_serial key to compute roles
I missed this the changes from I4ee0110a6c2b9466d81e37e5df27f5f81a6eceb5 when
rebasing I9f40a2a3561fcb1d1fec9d9c3c1f9cabaf02650c.
Add the missing key to the roles and add some validation to catch this.
Change-Id: I0f38df69777340ebbdc5c419f121524dbc74cad7
Related-bug: #1831617
Implements: blueprint nova-backend-per-role
(cherry picked from commit c2977e3c00
)
This commit is contained in:
parent
7561281feb
commit
7b72488d2e
|
@ -13,6 +13,8 @@
|
|||
subnet: storage_subnet
|
||||
StorageMgmt:
|
||||
subnet: storage_mgmt_subnet
|
||||
# CephOSD present so serial has to be 1
|
||||
update_serial: 1
|
||||
RoleParametersDefault:
|
||||
TunedProfileName: "cpu-partitioning"
|
||||
VhostuserSocketGroup: "hugetlbfs"
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
subnet: tenant_subnet
|
||||
Storage:
|
||||
subnet: storage_subnet
|
||||
update_serial: 25
|
||||
HostnameFormatDefault: '%stackname%-novacompute-local-%index%'
|
||||
RoleParametersDefault:
|
||||
TunedProfileName: "virtual-host"
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
subnet: tenant_subnet
|
||||
Storage:
|
||||
subnet: storage_subnet
|
||||
update_serial: 25
|
||||
HostnameFormatDefault: '%stackname%-novacompute-rbd-%index%'
|
||||
RoleParametersDefault:
|
||||
TunedProfileName: "virtual-host"
|
||||
|
|
|
@ -459,8 +459,27 @@ def validate_with_compute_role_services(role_filename, role_tpl, exclude_service
|
|||
'ServicesDefault in roles/Compute.yaml'.format(role_filename,
|
||||
', '.join(missing_services)))
|
||||
return 1
|
||||
return 0
|
||||
|
||||
cmpt_us = cmpt_tpl[0].get('update_serial', None)
|
||||
tpl_us = role_tpl[0].get('update_serial', None)
|
||||
|
||||
if 'OS::TripleO::Services::CephOSD' in role_services:
|
||||
if tpl_us not in (None, 1):
|
||||
print('ERROR: update_serial in {0} ({1}) '
|
||||
'is should be 1 as it includes CephOSD'.format(
|
||||
role_filename,
|
||||
tpl_us,
|
||||
cmpt_us))
|
||||
return 1
|
||||
elif cmpt_us is not None and tpl_us != cmpt_us:
|
||||
print('ERROR: update_serial in {0} ({1}) '
|
||||
'does not match roles/Compute.yaml {2}'.format(
|
||||
role_filename,
|
||||
tpl_us,
|
||||
cmpt_us))
|
||||
return 1
|
||||
|
||||
return 0
|
||||
|
||||
def validate_multiarch_compute_roles(role_filename, role_tpl):
|
||||
errors = 0
|
||||
|
|
Loading…
Reference in New Issue