Skip to content

Commit b6575fc

Browse files
authored
Relocate role plugins (#245)
* Move cm_prepare_db module * Move jdk_facts module * Update reference to cm_prepare_db module * Update reference to jdk_facts and alternatives modules Signed-off-by: Webster Mudge <[email protected]>
1 parent b9cec79 commit b6575fc

File tree

4 files changed

+21
-14
lines changed

4 files changed

+21
-14
lines changed

roles/cm_server/library/cm_prepare_db.py renamed to plugins/modules/cm_prepare_db.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#!/usr/bin/python
12
# -*- coding: utf-8 -*-
23

34
# Copyright 2024 Cloudera, Inc.
File renamed without changes.

roles/cm_server/tasks/main.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,16 @@
6060
ansible.builtin.package_facts:
6161

6262
- name: Prepare Cloudera Manager server external database
63-
cm_prepare_db:
64-
script: "{{
65-
(
66-
ansible_facts.packages['cloudera-manager-server'] |
67-
map(attribute='version') |
68-
first is version('6.0.0', '>=')
69-
) |
70-
ternary('/opt/cloudera/cm/schema/scm_prepare_database.sh', '/usr/share/cmf/schema/scm_prepare_database.sh')
71-
}}"
63+
cloudera.exe.cm_prepare_db:
64+
script: >
65+
{{
66+
(
67+
ansible_facts.packages['cloudera-manager-server'] |
68+
map(attribute='version') |
69+
first is version('6.0.0', '>=')
70+
) |
71+
ternary('/opt/cloudera/cm/schema/scm_prepare_database.sh', '/usr/share/cmf/schema/scm_prepare_database.sh')
72+
}}
7273
type: "{{ cloudera_manager_database_type }}"
7374
host: "{{ cloudera_manager_database_host }}"
7475
port: "{{ cloudera_manager_database_port }}"

roles/prereq_jdk/tasks/main.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
register: __jdk_home
4646

4747
- name: Create alternatives symlink for Cloudera Java binary
48-
ansible.builtin.alternatives:
48+
community.general.alternatives:
4949
name: java
5050
link: /usr/bin/java
5151
path: "{{ __jdk_home.files[0].path }}/bin/java"
@@ -59,7 +59,7 @@
5959
when: __jdk_home.matched
6060

6161
- name: Discover installed JDK details
62-
jdk_facts:
62+
cloudera.exe.jdk_facts:
6363

6464
- name: Enable JCE policy for JDK 9 or lower
6565
when: ansible_facts.jdk["version"] is not version("10.0.0", ">=", version_type="loose")
@@ -99,10 +99,15 @@
9999
when: >
100100
ansible_facts.jdk["provider"] == "openjdk" and
101101
(
102-
(ansible_facts.jdk["version"] is version("1.8", ">=", version_type="loose") and ansible_facts.jdk["version"] is version("1.9", "<=", version_type="loose") and
103-
ansible_facts.jdk["update"]|int >= 242)
102+
(
103+
ansible_facts.jdk["version"] is version("1.8", ">=", version_type="loose") and
104+
ansible_facts.jdk["version"] is version("1.9", "<=", version_type="loose") and
105+
ansible_facts.jdk["update"] | int >= 242
106+
)
104107
or
105-
(ansible_facts.jdk["version"] is version("11.0.6", ">=", version_type="semver"))
108+
(
109+
ansible_facts.jdk["version"] is version("11.0.6", ">=", version_type="semver")
110+
)
106111
)
107112
108113
# https://docs.cloudera.com/cdp-private-cloud-base/7.1.9/installation/topics/cdpdc-manually-installing-openjdk.html

0 commit comments

Comments
 (0)