Merge "Add missing update_serial key to compute roles"
This commit is contained in:
commit
dac0f85f7a
@ -13,6 +13,8 @@
|
|||||||
subnet: storage_subnet
|
subnet: storage_subnet
|
||||||
StorageMgmt:
|
StorageMgmt:
|
||||||
subnet: storage_mgmt_subnet
|
subnet: storage_mgmt_subnet
|
||||||
|
# CephOSD present so serial has to be 1
|
||||||
|
update_serial: 1
|
||||||
RoleParametersDefault:
|
RoleParametersDefault:
|
||||||
TunedProfileName: "cpu-partitioning"
|
TunedProfileName: "cpu-partitioning"
|
||||||
VhostuserSocketGroup: "hugetlbfs"
|
VhostuserSocketGroup: "hugetlbfs"
|
||||||
|
@ -15,6 +15,7 @@
|
|||||||
subnet: tenant_subnet
|
subnet: tenant_subnet
|
||||||
Storage:
|
Storage:
|
||||||
subnet: storage_subnet
|
subnet: storage_subnet
|
||||||
|
update_serial: 25
|
||||||
HostnameFormatDefault: '%stackname%-novacompute-local-%index%'
|
HostnameFormatDefault: '%stackname%-novacompute-local-%index%'
|
||||||
RoleParametersDefault:
|
RoleParametersDefault:
|
||||||
TunedProfileName: "virtual-host"
|
TunedProfileName: "virtual-host"
|
||||||
|
@ -15,6 +15,7 @@
|
|||||||
subnet: tenant_subnet
|
subnet: tenant_subnet
|
||||||
Storage:
|
Storage:
|
||||||
subnet: storage_subnet
|
subnet: storage_subnet
|
||||||
|
update_serial: 25
|
||||||
HostnameFormatDefault: '%stackname%-novacompute-rbd-%index%'
|
HostnameFormatDefault: '%stackname%-novacompute-rbd-%index%'
|
||||||
RoleParametersDefault:
|
RoleParametersDefault:
|
||||||
TunedProfileName: "virtual-host"
|
TunedProfileName: "virtual-host"
|
||||||
|
@ -452,8 +452,27 @@ def validate_with_compute_role_services(role_filename, role_tpl, exclude_service
|
|||||||
'ServicesDefault in roles/Compute.yaml'.format(role_filename,
|
'ServicesDefault in roles/Compute.yaml'.format(role_filename,
|
||||||
', '.join(missing_services)))
|
', '.join(missing_services)))
|
||||||
return 1
|
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):
|
def validate_multiarch_compute_roles(role_filename, role_tpl):
|
||||||
errors = 0
|
errors = 0
|
||||||
|
Loading…
Reference in New Issue
Block a user