Add CephNfs service on roles providing "external" network connectivity
With the recent changes meant to allow deployment of Ganesha on the "external" network, the CephNfs service can be added to more roles than just ControllerStorageNfs. Change-Id: Ic9010307c2aab7041c8ae30c72cc1bf99fdd22f6 Closes-Bug: 1961578 (cherry picked from commite1de2bcb72
) (cherry picked from commit31eafc7353
)
This commit is contained in:
parent
950f64010f
commit
2fb1cbfa0e
|
@ -58,6 +58,7 @@
|
||||||
- OS::TripleO::Services::CephMds
|
- OS::TripleO::Services::CephMds
|
||||||
- OS::TripleO::Services::CephMgr
|
- OS::TripleO::Services::CephMgr
|
||||||
- OS::TripleO::Services::CephMon
|
- OS::TripleO::Services::CephMon
|
||||||
|
- OS::TripleO::Services::CephNfs
|
||||||
- OS::TripleO::Services::CephRbdMirror
|
- OS::TripleO::Services::CephRbdMirror
|
||||||
- OS::TripleO::Services::CephRgw
|
- OS::TripleO::Services::CephRgw
|
||||||
- OS::TripleO::Services::CertmongerUser
|
- OS::TripleO::Services::CertmongerUser
|
||||||
|
|
|
@ -41,6 +41,7 @@
|
||||||
- OS::TripleO::Services::CephMds
|
- OS::TripleO::Services::CephMds
|
||||||
- OS::TripleO::Services::CephMgr
|
- OS::TripleO::Services::CephMgr
|
||||||
- OS::TripleO::Services::CephMon
|
- OS::TripleO::Services::CephMon
|
||||||
|
- OS::TripleO::Services::CephNfs
|
||||||
- OS::TripleO::Services::CephRbdMirror
|
- OS::TripleO::Services::CephRbdMirror
|
||||||
- OS::TripleO::Services::CephRgw
|
- OS::TripleO::Services::CephRgw
|
||||||
- OS::TripleO::Services::CertmongerUser
|
- OS::TripleO::Services::CertmongerUser
|
||||||
|
|
|
@ -45,6 +45,7 @@
|
||||||
- OS::TripleO::Services::CephMds
|
- OS::TripleO::Services::CephMds
|
||||||
- OS::TripleO::Services::CephMgr
|
- OS::TripleO::Services::CephMgr
|
||||||
- OS::TripleO::Services::CephMon
|
- OS::TripleO::Services::CephMon
|
||||||
|
- OS::TripleO::Services::CephNfs
|
||||||
- OS::TripleO::Services::CephRbdMirror
|
- OS::TripleO::Services::CephRbdMirror
|
||||||
- OS::TripleO::Services::CephRgw
|
- OS::TripleO::Services::CephRgw
|
||||||
- OS::TripleO::Services::CertmongerUser
|
- OS::TripleO::Services::CertmongerUser
|
||||||
|
|
|
@ -46,6 +46,7 @@
|
||||||
- OS::TripleO::Services::CephMds
|
- OS::TripleO::Services::CephMds
|
||||||
- OS::TripleO::Services::CephMgr
|
- OS::TripleO::Services::CephMgr
|
||||||
- OS::TripleO::Services::CephMon
|
- OS::TripleO::Services::CephMon
|
||||||
|
- OS::TripleO::Services::CephNfs
|
||||||
- OS::TripleO::Services::CephRbdMirror
|
- OS::TripleO::Services::CephRbdMirror
|
||||||
- OS::TripleO::Services::CephRgw
|
- OS::TripleO::Services::CephRgw
|
||||||
- OS::TripleO::Services::CertmongerUser
|
- OS::TripleO::Services::CertmongerUser
|
||||||
|
|
|
@ -55,6 +55,7 @@
|
||||||
- OS::TripleO::Services::CephMds
|
- OS::TripleO::Services::CephMds
|
||||||
- OS::TripleO::Services::CephMgr
|
- OS::TripleO::Services::CephMgr
|
||||||
- OS::TripleO::Services::CephMon
|
- OS::TripleO::Services::CephMon
|
||||||
|
- OS::TripleO::Services::CephNfs
|
||||||
- OS::TripleO::Services::CephRbdMirror
|
- OS::TripleO::Services::CephRbdMirror
|
||||||
- OS::TripleO::Services::CephRgw
|
- OS::TripleO::Services::CephRgw
|
||||||
- OS::TripleO::Services::CertmongerUser
|
- OS::TripleO::Services::CertmongerUser
|
||||||
|
|
|
@ -56,6 +56,7 @@
|
||||||
- OS::TripleO::Services::CephMds
|
- OS::TripleO::Services::CephMds
|
||||||
- OS::TripleO::Services::CephMgr
|
- OS::TripleO::Services::CephMgr
|
||||||
- OS::TripleO::Services::CephMon
|
- OS::TripleO::Services::CephMon
|
||||||
|
- OS::TripleO::Services::CephNfs
|
||||||
- OS::TripleO::Services::CephRbdMirror
|
- OS::TripleO::Services::CephRbdMirror
|
||||||
- OS::TripleO::Services::CephRgw
|
- OS::TripleO::Services::CephRgw
|
||||||
- OS::TripleO::Services::CertmongerUser
|
- OS::TripleO::Services::CertmongerUser
|
||||||
|
|
|
@ -61,6 +61,7 @@
|
||||||
- OS::TripleO::Services::CephMds
|
- OS::TripleO::Services::CephMds
|
||||||
- OS::TripleO::Services::CephMgr
|
- OS::TripleO::Services::CephMgr
|
||||||
- OS::TripleO::Services::CephMon
|
- OS::TripleO::Services::CephMon
|
||||||
|
- OS::TripleO::Services::CephNfs
|
||||||
- OS::TripleO::Services::CephRbdMirror
|
- OS::TripleO::Services::CephRbdMirror
|
||||||
- OS::TripleO::Services::CephRgw
|
- OS::TripleO::Services::CephRgw
|
||||||
- OS::TripleO::Services::CertmongerUser
|
- OS::TripleO::Services::CertmongerUser
|
||||||
|
|
|
@ -103,3 +103,4 @@
|
||||||
- OS::TripleO::Services::UndercloudUpgrade
|
- OS::TripleO::Services::UndercloudUpgrade
|
||||||
- OS::TripleO::Services::TripleoValidations
|
- OS::TripleO::Services::TripleoValidations
|
||||||
- OS::TripleO::Services::Zaqar
|
- OS::TripleO::Services::Zaqar
|
||||||
|
|
||||||
|
|
|
@ -408,23 +408,6 @@ def validate_controller_dashboard(filename, tpl):
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
|
|
||||||
def validate_controller_storage_nfs(filename, tpl, exclude_service=()):
|
|
||||||
control_role_filename = os.path.join(os.path.dirname(filename),
|
|
||||||
'./Controller.yaml')
|
|
||||||
with open(control_role_filename, 'r') as f:
|
|
||||||
control_role_tpl = yaml.safe_load(f.read())
|
|
||||||
|
|
||||||
control_role_services = control_role_tpl[0]['ServicesDefault']
|
|
||||||
for role in tpl:
|
|
||||||
if role['name'] == 'ControllerStorageNfs':
|
|
||||||
services = [x for x in role['ServicesDefault'] if (x not in exclude_service)]
|
|
||||||
if sorted(services) != sorted(control_role_services):
|
|
||||||
print('ERROR: ServicesDefault in %s is different from '
|
|
||||||
'ServicesDefault in roles/Controller.yaml' % filename)
|
|
||||||
return 1
|
|
||||||
return 0
|
|
||||||
|
|
||||||
|
|
||||||
def validate_hci_role(hci_role_filename, hci_role_tpl):
|
def validate_hci_role(hci_role_filename, hci_role_tpl):
|
||||||
role_files = ['HciCephAll', 'HciCephFile', 'HciCephMon', 'HciCephObject']
|
role_files = ['HciCephAll', 'HciCephFile', 'HciCephMon', 'HciCephObject']
|
||||||
if hci_role_filename in ['./roles/' + x + '.yaml' for x in role_files]:
|
if hci_role_filename in ['./roles/' + x + '.yaml' for x in role_files]:
|
||||||
|
@ -512,6 +495,7 @@ def validate_controller_no_ceph_role(filename, tpl):
|
||||||
services.append('OS::TripleO::Services::CephMgr')
|
services.append('OS::TripleO::Services::CephMgr')
|
||||||
services.append('OS::TripleO::Services::CephGrafana')
|
services.append('OS::TripleO::Services::CephGrafana')
|
||||||
services.append('OS::TripleO::Services::CephMon')
|
services.append('OS::TripleO::Services::CephMon')
|
||||||
|
services.append('OS::TripleO::Services::CephNfs')
|
||||||
services.append('OS::TripleO::Services::CephRbdMirror')
|
services.append('OS::TripleO::Services::CephRbdMirror')
|
||||||
services.append('OS::TripleO::Services::CephRgw')
|
services.append('OS::TripleO::Services::CephRgw')
|
||||||
if sorted(services) != sorted(control_role_services):
|
if sorted(services) != sorted(control_role_services):
|
||||||
|
@ -1179,11 +1163,6 @@ def validate(filename, param_map):
|
||||||
filename.startswith('./roles/ComputeHCISriov.yaml'):
|
filename.startswith('./roles/ComputeHCISriov.yaml'):
|
||||||
retval |= validate_hci_computehci_role(filename, tpl)
|
retval |= validate_hci_computehci_role(filename, tpl)
|
||||||
|
|
||||||
if filename.startswith('./roles/ControllerStorageNfs.yaml'):
|
|
||||||
exclude = [
|
|
||||||
'OS::TripleO::Services::CephNfs']
|
|
||||||
retval |= validate_controller_storage_nfs(filename, tpl, exclude)
|
|
||||||
|
|
||||||
if filename.startswith('./roles/ControllerStorageDashboard.yaml'):
|
if filename.startswith('./roles/ControllerStorageDashboard.yaml'):
|
||||||
retval |= validate_controller_dashboard(filename, tpl)
|
retval |= validate_controller_dashboard(filename, tpl)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue