Skip to content

Commit 136395b

Browse files
committed
Rename warn module to deprecation and add version parameter
Signed-off-by: Webster Mudge <[email protected]>
1 parent 18d4510 commit 136395b

File tree

82 files changed

+259
-560
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+259
-560
lines changed

plugins/modules/warn.py renamed to plugins/modules/deprecation.py

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,35 @@
1616
# limitations under the License.
1717

1818
DOCUMENTATION = r"""
19-
module: warn
20-
short_description: Display a warning
19+
module: deprecation
20+
short_description: Display a deprecation warning
2121
description:
22-
- Displays a standard Ansible module warning.
22+
- Displays a standard Ansible deprecation warning
2323
author:
2424
- "Webster Mudge (@wmudge)"
2525
version_added: "5.0.0"
2626
options:
2727
msg:
2828
description:
29-
- The warning message.
29+
- The deprecation warning message.
3030
type: str
3131
required: true
32+
version:
33+
description:
34+
- Version details for the warning message.
35+
type: str
36+
required: false
3237
"""
3338

3439
EXAMPLES = r"""
35-
- name: Display a warning
36-
cloudera.cluster.warn:
37-
msg: This is a warning message.
40+
- name: Display a deprecation warning
41+
cloudera.cluster.deprecation:
42+
msg: A custom warning
43+
44+
- name: Display the deprecation warning with version details
45+
cloudera.cluster.deprecation:
46+
msg: A custom warning with version info
47+
version: "5.0.0"
3848
"""
3949

4050
RETURN = r""""""
@@ -46,8 +56,9 @@
4656
module = AnsibleModule(
4757
argument_spec=dict(
4858
msg=dict(required="True"),
59+
version=dict(),
4960
),
5061
)
5162

52-
module.warn(module.params["msg"])
63+
module.deprecate(module.params.get("msg"), module.params.get("version", None))
5364
module.exit_json()

roles/cloudera_manager/admin_password/check/tasks/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
---
1616

1717
- name: Deprecation warning
18-
when: deprecation_msg is defined
1918
run_once: true
20-
cloudera.cluster.warn:
21-
msg: "{{ deprecation_msg }}"
19+
cloudera.cluster.deprecation:
20+
msg: "Role, {{ ansible_role_name }}, is no longer supported."
21+
version: 6.0.0
2222

2323
- name: Wait for Cloudera Manager Port to be up
2424
delegate_to: "{{ groups.cloudera_manager[0] if 'cloudera_manager' in groups else 'localhost' }}"

roles/cloudera_manager/admin_password/set/tasks/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
---
1616

1717
- name: Deprecation warning
18-
when: deprecation_msg is defined
1918
run_once: true
20-
cloudera.cluster.warn:
21-
msg: "{{ deprecation_msg }}"
19+
cloudera.cluster.deprecation:
20+
msg: "Role, {{ ansible_role_name }}, is no longer supported."
21+
version: 6.0.0
2222

2323
- name: Update the Cloudera Manager admin password
2424
cloudera.cluster.cm_api:

roles/cloudera_manager/agent/tasks/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
---
1616

1717
- name: Deprecation warning
18-
when: deprecation_msg is defined
1918
run_once: true
20-
cloudera.cluster.warn:
21-
msg: "{{ deprecation_msg }}"
19+
cloudera.cluster.deprecation:
20+
msg: "Role, {{ ansible_role_name }}, is no longer supported."
21+
version: 6.0.0
2222

2323
- name: Gather the package facts
2424
ansible.builtin.package_facts:

roles/cloudera_manager/agent_config/tasks/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
---
1616

1717
- name: Deprecation warning
18-
when: deprecation_msg is defined
1918
run_once: true
20-
cloudera.cluster.warn:
21-
msg: "{{ deprecation_msg }}"
19+
cloudera.cluster.deprecation:
20+
msg: "Role, {{ ansible_role_name }}, is no longer supported."
21+
version: 6.0.0
2222

2323
- name: Set Cloudera Manager agent 'server_host' in config.ini
2424
lineinfile:

roles/cloudera_manager/api_client/tasks/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
---
1616

1717
- name: Deprecation warning
18-
when: deprecation_msg is defined
1918
run_once: true
20-
cloudera.cluster.warn:
21-
msg: "{{ deprecation_msg }}"
19+
cloudera.cluster.deprecation:
20+
msg: "Role, {{ ansible_role_name }}, is no longer supported."
21+
version: 6.0.0
2222

2323
- set_fact:
2424
cloudera_manager_url: "{{ cloudera_manager_protocol }}://{{ cloudera_manager_host }}:{{ cloudera_manager_port }}"

roles/cloudera_manager/api_hosts/tasks/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
---
1616

1717
- name: Deprecation warning
18-
when: deprecation_msg is defined
1918
run_once: true
20-
cloudera.cluster.warn:
21-
msg: "{{ deprecation_msg }}"
19+
cloudera.cluster.deprecation:
20+
msg: "Role, {{ ansible_role_name }}, is no longer supported."
21+
version: 6.0.0
2222

2323
- name: Get the host identifiers and names from Cloudera Manager
2424
delegate_to: "{{ groups.cloudera_manager[0] if 'cloudera_manager' in groups else 'localhost' }}"

roles/cloudera_manager/autotls/tasks/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
---
1616

1717
- name: Deprecation warning
18-
when: deprecation_msg is defined
1918
run_once: true
20-
cloudera.cluster.warn:
21-
msg: "{{ deprecation_msg }}"
19+
cloudera.cluster.deprecation:
20+
msg: "Role, {{ ansible_role_name }}, is no longer supported."
21+
version: 6.0.0
2222

2323
- name: Check Cloudera Manager version
2424
cloudera.cluster.cm_api:

roles/cloudera_manager/cms_tls/tasks/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22

33
- name: Deprecation warning
4-
when: deprecation_msg is defined
54
run_once: true
6-
cloudera.cluster.warn:
7-
msg: "{{ deprecation_msg }}"
5+
cloudera.cluster.deprecation:
6+
msg: "Role, {{ ansible_role_name }}, is no longer supported."
7+
version: 6.0.0
88

99
- name: Setup TLS for Activity Monitor
1010
cm_api:

roles/cloudera_manager/common/defaults/main.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,3 @@ cloudera_manager_database_password: changeme
3030
cloudera_manager_database_port: "{{ database_type | cloudera.cluster.default_database_port }}"
3131
cloudera_manager_agent_lib_directory: /var/lib/cloudera-scm-agent
3232
cloudera_manager_cmf_java_opts_default: "-Xmx4G -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp"
33-
34-
deprecation_msg: |
35-
This role will be removed from the collection in release 6.0.0.
36-
Please refer to the collection README for details.
37-
Deprecation warnings can be disabled by setting deprecation_warnings=False in
38-
ansible.cfg.

0 commit comments

Comments
 (0)