Skip to content

Commit

Permalink
Fix pre-commit errors
Browse files Browse the repository at this point in the history
Signed-off-by: Webster Mudge <[email protected]>
  • Loading branch information
wmudge committed Sep 12, 2024
1 parent 9c25e23 commit f12bb80
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion roles/config/cluster/base/templates/configs/tls-7.1.7.j2
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---
OZONE:
SERVICEWIDE:
hdds.grpc.tls.enabled: true
hdds.grpc.tls.enabled: true
2 changes: 1 addition & 1 deletion roles/config/cluster/base/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ custom_config_templates:
- template: configs/tls-7.3.1.j2
condition: "{{ cluster.security.tls | default(False) and cloudera_manager_version is version('7.3.1', '>=') }}"
- template: configs/tls-cm-7.j2
condition: "{{ cluster.security.tls | default(False) and cloudera_manager_version is version('7.1.0','>=') }}"
condition: "{{ cluster.security.tls | default(False) and cloudera_manager_version is version('7.1.0','>=') }}"
# Custom configurations for Cloudera Streams Processing components on CDH 6.x
- template: configs/schemaregistry.j2
condition: >-
Expand Down
2 changes: 1 addition & 1 deletion roles/config/cluster/ecs/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
- set_fact:
# databases: "{{ database_defaults | combine(cluster.databases | default({}), recursive=True) }}"
databases: []

- name: Retrieve repository metadata
include_role:
name: cloudera.cluster.deployment.repometa
Expand Down
4 changes: 2 additions & 2 deletions roles/deployment/definition/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ default_database_versions:
'9': 10.6
mysql:
'7': 5.7
'8': 8.0
'9': 8.0
'8': 8.0
'9': 8.0

# Located in cloudera.cluster.infrastructure.krb5_common
#krb5_realm: CLOUDERA.LOCAL
Expand Down
4 changes: 2 additions & 2 deletions roles/prereqs/os/vars/RedHat-7.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
v# Copyright 2024 Cloudera, Inc. All Rights Reserved.
# Copyright 2024 Cloudera, Inc. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -21,4 +21,4 @@ ntp_package: ntp
ntp_service: ntpd
rngd_package: rng-tools
rngd_service: rngd
needs_python2: True
needs_python2: True
2 changes: 1 addition & 1 deletion roles/prereqs/os/vars/RedHat-8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ ntp_package: ntp
ntp_service: ntpd
rngd_package: rng-tools
rngd_service: rngd
needs_python2: True
needs_python2: True
2 changes: 1 addition & 1 deletion roles/prereqs/os/vars/RedHat-9.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ ntp_package: ntp
ntp_service: ntpd
rngd_package: rng-tools
rngd_service: rngd
needs_python2: False
needs_python2: False
12 changes: 6 additions & 6 deletions roles/prereqs/pvc_ecs/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,21 @@
state: present

- name: Setup iptables for rhel8
when:
when:
- ansible_distribution_major_version | int == 8
block:
- name: Install iptables for rhel8, using rpm option tsflags=noscripts
ansible.builtin.command: dnf install -y iptables --setopt=tsflags=noscripts

- name: Setup deprecated iptables for rhel9
when:
when:
- ansible_distribution_major_version | int >= 9
block:
- name: Install iptables for rhel9, using rpm option tsflags=noscripts
ansible.builtin.command: dnf install -y iptables --setopt=tsflags=noscripts

- name: Check for existence of lnk /usr/sbin/iptables-nft
ansible.builtin.stat:
ansible.builtin.stat:
path: /usr/sbin/iptables-nft
register: iptables_nft

Expand All @@ -84,7 +84,7 @@
state: link
follow: false
when: iptables_nft.stat.islnk

- name: Flush iptables
ansible.builtin.iptables:
flush: yes
Expand All @@ -107,10 +107,10 @@
group: root
mode: 0644
when: ansible_facts.services["NetworkManager.service"]['status'] != "not-found"

- name: Reload NetworkManager daemon
ansible.builtin.service:
state: restarted
daemon_reload: true
name: NetworkManager.service
name: NetworkManager.service
when: ansible_facts.services["NetworkManager.service"]['status'] != "not-found"

0 comments on commit f12bb80

Please sign in to comment.