diff --git a/roles/config/cluster/base/templates/configs/tls-7.1.7.j2 b/roles/config/cluster/base/templates/configs/tls-7.1.7.j2 index b13928cb..97125710 100644 --- a/roles/config/cluster/base/templates/configs/tls-7.1.7.j2 +++ b/roles/config/cluster/base/templates/configs/tls-7.1.7.j2 @@ -1,4 +1,4 @@ --- OZONE: SERVICEWIDE: - hdds.grpc.tls.enabled: true \ No newline at end of file + hdds.grpc.tls.enabled: true diff --git a/roles/config/cluster/base/vars/main.yml b/roles/config/cluster/base/vars/main.yml index 4e891930..1fd59894 100644 --- a/roles/config/cluster/base/vars/main.yml +++ b/roles/config/cluster/base/vars/main.yml @@ -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: >- diff --git a/roles/config/cluster/ecs/tasks/main.yml b/roles/config/cluster/ecs/tasks/main.yml index 6024a0ed..908d2943 100644 --- a/roles/config/cluster/ecs/tasks/main.yml +++ b/roles/config/cluster/ecs/tasks/main.yml @@ -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 diff --git a/roles/deployment/definition/defaults/main.yml b/roles/deployment/definition/defaults/main.yml index 63ed49c3..8ad4595c 100644 --- a/roles/deployment/definition/defaults/main.yml +++ b/roles/deployment/definition/defaults/main.yml @@ -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 diff --git a/roles/prereqs/os/vars/RedHat-7.yml b/roles/prereqs/os/vars/RedHat-7.yml index 3a4b0cf1..9c218e81 100644 --- a/roles/prereqs/os/vars/RedHat-7.yml +++ b/roles/prereqs/os/vars/RedHat-7.yml @@ -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. @@ -21,4 +21,4 @@ ntp_package: ntp ntp_service: ntpd rngd_package: rng-tools rngd_service: rngd -needs_python2: True \ No newline at end of file +needs_python2: True diff --git a/roles/prereqs/os/vars/RedHat-8.yml b/roles/prereqs/os/vars/RedHat-8.yml index 0329c92d..9c218e81 100644 --- a/roles/prereqs/os/vars/RedHat-8.yml +++ b/roles/prereqs/os/vars/RedHat-8.yml @@ -21,4 +21,4 @@ ntp_package: ntp ntp_service: ntpd rngd_package: rng-tools rngd_service: rngd -needs_python2: True \ No newline at end of file +needs_python2: True diff --git a/roles/prereqs/os/vars/RedHat-9.yml b/roles/prereqs/os/vars/RedHat-9.yml index 86e25f38..c67e89aa 100644 --- a/roles/prereqs/os/vars/RedHat-9.yml +++ b/roles/prereqs/os/vars/RedHat-9.yml @@ -21,4 +21,4 @@ ntp_package: ntp ntp_service: ntpd rngd_package: rng-tools rngd_service: rngd -needs_python2: False \ No newline at end of file +needs_python2: False diff --git a/roles/prereqs/pvc_ecs/tasks/main.yml b/roles/prereqs/pvc_ecs/tasks/main.yml index be177bcb..37f4501d 100644 --- a/roles/prereqs/pvc_ecs/tasks/main.yml +++ b/roles/prereqs/pvc_ecs/tasks/main.yml @@ -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 @@ -84,7 +84,7 @@ state: link follow: false when: iptables_nft.stat.islnk - + - name: Flush iptables ansible.builtin.iptables: flush: yes @@ -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"