Skip to content

Commit

Permalink
migrate rdbms to exe - RHEL 9 fixes
Browse files Browse the repository at this point in the history
Signed-off-by: Chuck Levesque <[email protected]>
  • Loading branch information
clevesque committed Mar 11, 2024
1 parent c5a0e42 commit e3040d6
Show file tree
Hide file tree
Showing 44 changed files with 108 additions and 1,225 deletions.
10 changes: 1 addition & 9 deletions builder/requirements.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
# Copyright 2023 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 @@ -16,11 +16,3 @@
collections:
- source: .
type: dir

roles:
- name: geerlingguy.postgresql
version: 2.2.0

# geerlingguy.mysql with fix for issue #332
- src: https://github.com/dbeech/ansible-role-mysql
version: master
4 changes: 2 additions & 2 deletions galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

namespace: cloudera
name: cluster
version: 4.3.0
version: 4.3.0-dev
readme: README.md
authors: []

Expand All @@ -35,7 +35,7 @@ tags:

dependencies:
'ansible.posix': '1.3.0'
'community.crypto': '2.2.1'
'community.crypto': '2.17.1'
'community.general': '4.5.0'

repository: https://github.com/cloudera-labs/cloudera.cluster
Expand Down
15 changes: 4 additions & 11 deletions requirements.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---

# Copyright 2023 Cloudera, Inc.
# Copyright 2024 Cloudera, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -14,24 +14,17 @@
# See the License for the specific language governing permissions and
# limitations under the License.

roles:
- name: geerlingguy.postgresql
version: 2.2.0

# geerlingguy.mysql with fix for issue #332
- src: https://github.com/dbeech/ansible-role-mysql
version: master

collections:
- name: ansible.posix
version: 1.3.0
- name: community.crypto
version: 2.2.1
version: 2.17.1
- name: community.general
version: 4.5.0
- name: community.mysql
version: 3.1.0
version: 3.8.0
- name: community.postgresql
version: 1.6.1
version: 3.3.0
- name: freeipa.ansible_freeipa
version: 1.11.1
2 changes: 1 addition & 1 deletion roles/config/cluster/base/templates/configs/tls-7.1.0.j2
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ LIVY:
ssl_server_keystore_location: {{ tls_keystore_path_generic }}
ssl_server_keystore_password: {{ tls_keystore_password }}
OZONE:
DATANODE:
OZONE_DATANODE:
ssl_client_truststore_location: {{ tls_truststore_path }}
ssl_client_truststore_password: {{ tls_truststore_password }}
ssl_enabled: true
Expand Down
4 changes: 4 additions & 0 deletions roles/config/cluster/base/templates/configs/tls-7.1.7.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
OZONE:
SERVICEWIDE:
hdds.grpc.tls.enabled: true
10 changes: 8 additions & 2 deletions roles/config/cluster/base/templates/configs/tls-cm-7.j2
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,7 @@ LIVY:
ssl_enabled: true
ssl_server_keystore_location: {{ tls_keystore_path_generic }}
ssl_server_keystore_password: {{ tls_keystore_password }}
OZONE:
DATANODE:
OZONE_DATANODE:
ssl_client_truststore_location: {{ tls_truststore_path }}
ssl_client_truststore_password: {{ tls_truststore_password }}
ssl_enabled: true
Expand Down Expand Up @@ -143,6 +142,13 @@ OZONE:
ssl_server_keystore_keypassword: {{ tls_keystore_password }}
ssl_server_keystore_location: {{ tls_keystore_path_generic }}
ssl_server_keystore_password: {{ tls_keystore_password }}
HTTPFS_GATEWAY:
ssl_client_truststore_location: {{ tls_truststore_path }}
ssl_client_truststore_password: {{ tls_truststore_password }}
ssl_enabled: true
ssl_server_keystore_keypassword: {{ tls_keystore_password }}
ssl_server_keystore_location: {{ tls_keystore_path_generic }}
ssl_server_keystore_password: {{ tls_keystore_password }}
NIFI:
NIFI_NODE:
ssl_enabled: true
Expand Down
4 changes: 3 additions & 1 deletion roles/config/cluster/base/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,12 @@ custom_config_templates:
condition: "{{ cluster.security.tls | default(False) and cloudera_runtime_version is version('7.1.0','>=') }}"
- template: configs/tls-7.1.4.j2
condition: "{{ cluster.security.tls | default(False) and cloudera_runtime_version is version('7.1.4','>=') and (cloudera_runtime_pre_upgrade is undefined or cloudera_runtime_pre_upgrade is version('7.1.4','>=')) }}"
- template: configs/tls-7.1.7.j2
condition: "{{ cluster.security.tls | default(False) and cloudera_runtime_version is version('7.1.7','>=') }}"
- 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
5 changes: 3 additions & 2 deletions roles/config/cluster/ecs/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@
# This variable is used by other roles
# please take care when changing it
- set_fact:
databases: "{{ database_defaults | combine(cluster.databases | default({}), recursive=True) }}"

# databases: "{{ database_defaults | combine(cluster.databases | default({}), recursive=True) }}"
databases: []

- name: Retrieve repository metadata
include_role:
name: cloudera.cluster.deployment.repometa
Expand Down
11 changes: 7 additions & 4 deletions roles/deployment/definition/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2023 Cloudera, Inc.
# Copyright 2024 Cloudera, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -24,12 +24,15 @@ default_database_versions:
postgresql:
'7': 10
'8': 12
'9': 14
mariadb:
'7': 10.2
'8': 10.2
'8': 10.6
'9': 10.6
mysql:
'7': 5.7
'8': 8.0
'8': 8.0
'9': 8.0

# Located in cloudera.cluster.infrastructure.krb5_common
#krb5_realm: CLOUDERA.LOCAL
Expand Down Expand Up @@ -125,7 +128,7 @@ database_defaults:
QUEUEMANAGER:
host: "{{ database_host }}"
port: "{{ database_type | cloudera.cluster.default_database_port }}"
type: postgresql
type: "{{ database_type }}"
name: queuemanager
user: queuemanager
password: "{{ database_default_password }}"
Expand Down
9 changes: 9 additions & 0 deletions roles/infrastructure/krb5_client/tasks/freeipa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,12 @@
when:
- krb5_kdc_type == 'Red Hat IPA'
- "'cluster' in group_names or 'cloudera_manager' in group_names"

- name: Remove ipa includedir directive
lineinfile:
path: /etc/krb5.conf
regexp: "^includedir /etc/krb5.conf.d/"
state: absent
when:
- krb5_kdc_type == 'Red Hat IPA'
- "'cluster' in group_names or 'cloudera_manager' in group_names"
23 changes: 0 additions & 23 deletions roles/infrastructure/rdbms/files/utf8-template.sql

This file was deleted.

18 changes: 0 additions & 18 deletions roles/infrastructure/rdbms/meta/main.yml

This file was deleted.

29 changes: 0 additions & 29 deletions roles/infrastructure/rdbms/tasks/main.yml

This file was deleted.

31 changes: 0 additions & 31 deletions roles/infrastructure/rdbms/tasks/mariadb-Debian.yml

This file was deleted.

27 changes: 0 additions & 27 deletions roles/infrastructure/rdbms/tasks/mariadb-RedHat.yml

This file was deleted.

36 changes: 0 additions & 36 deletions roles/infrastructure/rdbms/tasks/mysql-RedHat.yml

This file was deleted.

40 changes: 0 additions & 40 deletions roles/infrastructure/rdbms/tasks/postgresql-Debian.yml

This file was deleted.

Loading

0 comments on commit e3040d6

Please sign in to comment.