Skip to content

Fixed handling of custom roleConfig Groups #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 25, 2022
Merged

Fixed handling of custom roleConfig Groups #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
580e027
Fixed handling of custom roleConfigGroups.
asdaraujo Mar 2, 2022
f382c54
Removed deprecated SMM parameters from template.
asdaraujo Mar 2, 2022
16222e1
Made error message more informative.
asdaraujo Mar 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions plugins/filter/filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,17 +211,17 @@ def extract_role_and_group(self, role_spec):
return (role, template_group)

def extract_custom_roles(self, host_templates, service):
custom_roles = []
custom_roles = set([])
for role_mapping in host_templates.values():
if service in role_mapping:
for custom_role in filter(lambda x: '/' in x, role_mapping[service]):
custom_roles.append(custom_role)
return custom_roles
custom_roles.add(custom_role)
return list(custom_roles)

def extract_custom_role_groups(self, host_templates):
custom_role_groups = []
custom_role_groups = set([])
for role_mapping in host_templates.values():
for (service, roles) in role_mapping.items():
for custom_role in filter(lambda x: '/' in x, roles):
custom_role_groups.append("-".join([service.lower()] + custom_role.split("/")))
return custom_role_groups
custom_role_groups.add("-".join([service.lower()] + custom_role.split("/")))
return list(custom_role_groups)
3 changes: 0 additions & 3 deletions roles/config/cluster/base/templates/configs/kerberos-6.x-7.x.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,3 @@ SPARK3_ON_YARN:
GATEWAY:
spark_io_encryption_enabled: true
spark_network_encryption_enabled: true
STREAMS_MESSAGING_MANAGER:
STREAMS_MESSAGING_MANAGER_SERVER:
streams.messaging.manager.kafka.client.security.protocol: {{ cluster.security.tls | default(false) | ternary('SASL_SSL', 'SASL_PLAINTEXT') }}
1 change: 0 additions & 1 deletion roles/config/cluster/base/templates/configs/tls-cm-7.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,6 @@ STREAMS_MESSAGING_MANAGER:
ssl_server_keystore_keypassword: {{ tls_keystore_password }}
ssl_server_keystore_location: {{ tls_keystore_path_generic }}
ssl_server_keystore_password: {{ tls_keystore_password }}
streams.messaging.manager.kafka.client.security.protocol: {{ cluster.security.kerberos | default(false) | ternary('SASL_SSL', 'SSL') }}
STREAMS_MESSAGING_MANAGER_UI:
ssl_client_truststore_location: {{ tls_chain_path }}
ssl_enabled: true
Expand Down
1 change: 1 addition & 0 deletions roles/verify/parcels_and_roles/tasks/check_template_roles.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
fail_msg: >-
Unknown role(s) {{ invalid_roles }} for service '{{ template.service }}'
defined in host template '{{ host_template.name }}'.
Valid roles are: {{ role_mappings[template.service] | list }}.

- name: Ensure the Tez gateway has been deployed
assert:
Expand Down