diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-03-01 11:05:45 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-03-01 11:05:45 +0000 |
commit | ea238df9de74d4a0a03521635d75491a5e95448d (patch) | |
tree | db7eb7df1be477062a5dacefe8b492ce05bde717 /tools | |
parent | 6c8f5017d7b1d4e69451bbced7556828346bf18c (diff) | |
parent | 6ff979aa75bc202fe571d0b2885daa4d7c56d655 (diff) |
Merge "Align hyperconverged-ceph.yaml environment and adds some validation"
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/yaml-validate.py | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py index 1d0dba02..32987cb2 100755 --- a/tools/yaml-validate.py +++ b/tools/yaml-validate.py @@ -54,6 +54,21 @@ def validate_endpoint_map(base_map, env_map): return sorted(base_map.keys()) == sorted(env_map.keys()) +def validate_hci_compute_services_default(env_filename, env_tpl): + env_services_list = env_tpl['parameter_defaults']['ComputeServices'] + env_services_list.remove('OS::TripleO::Services::CephOSD') + roles_filename = os.path.join(os.path.dirname(env_filename), + '../roles_data.yaml') + roles_tpl = yaml.load(open(roles_filename).read()) + for role in roles_tpl: + if role['name'] == 'Compute': + roles_services_list = role['ServicesDefault'] + if sorted(env_services_list) != sorted(roles_services_list): + print('ERROR: ComputeServices in %s is different ' + 'from ServicesDefault in roles_data.yaml' % env_filename) + return 1 + return 0 + def validate_mysql_connection(settings): no_op = lambda *args: False error_status = [0] @@ -143,6 +158,9 @@ def validate(filename): filename != './puppet/services/services.yaml'): retval = validate_service(filename, tpl) + if filename.endswith('hyperconverged-ceph.yaml'): + retval = validate_hci_compute_services_default(filename, tpl) + except Exception: print(traceback.format_exc()) return 1 |