Merge "Add missing update_serial key to compute roles" into stable/queens
This commit is contained in:
commit
ceeb663cfe
|
@ -12,6 +12,8 @@
|
||||||
HostnameFormatDefault: '%stackname%-computehciovsdpdk-%index%'
|
HostnameFormatDefault: '%stackname%-computehciovsdpdk-%index%'
|
||||||
disable_upgrade_deployment: True
|
disable_upgrade_deployment: True
|
||||||
deprecated_nic_config_name: 'compute-dpdk.yaml'
|
deprecated_nic_config_name: 'compute-dpdk.yaml'
|
||||||
|
# CephOSD present so serial has to be 1
|
||||||
|
update_serial: 1
|
||||||
RoleParametersDefault:
|
RoleParametersDefault:
|
||||||
TunedProfileName: "cpu-partitioning"
|
TunedProfileName: "cpu-partitioning"
|
||||||
VhostuserSocketGroup: "hugetlbfs"
|
VhostuserSocketGroup: "hugetlbfs"
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
- InternalApi
|
- InternalApi
|
||||||
- Tenant
|
- Tenant
|
||||||
- Storage
|
- Storage
|
||||||
|
update_serial: 25
|
||||||
HostnameFormatDefault: '%stackname%-novacompute-local-%index%'
|
HostnameFormatDefault: '%stackname%-novacompute-local-%index%'
|
||||||
RoleParametersDefault:
|
RoleParametersDefault:
|
||||||
TunedProfileName: "virtual-host"
|
TunedProfileName: "virtual-host"
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
- InternalApi
|
- InternalApi
|
||||||
- Tenant
|
- Tenant
|
||||||
- Storage
|
- Storage
|
||||||
|
update_serial: 25
|
||||||
HostnameFormatDefault: '%stackname%-novacompute-rbd-%index%'
|
HostnameFormatDefault: '%stackname%-novacompute-rbd-%index%'
|
||||||
RoleParametersDefault:
|
RoleParametersDefault:
|
||||||
TunedProfileName: "virtual-host"
|
TunedProfileName: "virtual-host"
|
||||||
|
|
|
@ -365,8 +365,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 search(item, check_item, check_key):
|
def search(item, check_item, check_key):
|
||||||
if check_item(item):
|
if check_item(item):
|
||||||
|
|
Loading…
Reference in New Issue