Skip to content

Commit

Permalink
Merge branch 'cloudera-labs:main' into teardown-db-flag
Browse files Browse the repository at this point in the history
  • Loading branch information
clevesque authored Dec 22, 2023
2 parents 751e415 + 6446141 commit 305c285
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 17 deletions.
2 changes: 1 addition & 1 deletion galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

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

Expand Down
13 changes: 6 additions & 7 deletions roles/assemble_template/meta/argument_specs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,12 @@
argument_specs:
main:
short_description: "Discover and render files into a cluster template"
description: |
Discovers fragment files in a specified directory, loops through fragment files
rendering them through M(ansible.builtin.template), places them in a temporary directory,
and then assembles a single, final cluster template.
Fragment files must be located on the Ansible controller since M(ansible.builtin.template) only executes on the controller.
This ensures that the template processing occurs on the Ansible controller machine.
author: "Ronald Suplina <[email protected]>"
description:
- Discovers fragment files in a specified directory, loops through fragment files rendering them through M(ansible.builtin.template), places them in a temporary directory, and then assembles a single, final cluster template.
- Fragment files must be located on the Ansible controller since M(ansible.builtin.template) only executes on the controller.
- This ensures that the template processing occurs on the Ansible controller machine.
author:
- "Ronald Suplina <[email protected]>"
options:
cluster_template_fragments_directory:
description: "Path to the directory containing fragment files for the cluster template"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ LDAP_URL: {{ auth_provider.ldap_url | default(None) }}
LDAP_USER_SEARCH_BASE: {{ auth_provider.ldap_search_base.user | default(None) }}
{% if auth_provider.ldap_search_filter.user is defined %}
LDAP_USER_SEARCH_FILTER: "{{ auth_provider.ldap_search_filter.user }}"
{% else % }
{% else %}
LDAP_USER_SEARCH_FILTER: "({{ auth_provider.ldap_attribute.user | default('sAMAccountName') }}={0})"
{% endif %}
NT_DOMAIN: {{ auth_provider.domain | default(None) }}
Expand Down
7 changes: 3 additions & 4 deletions roles/cloudera_manager/license/tasks/enterprise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
status_code: 200,404
register: license_response

- set_fact:
- name: Set installed Cloudera license flag
ansible.builtin.set_fact:
license_not_installed: >-
{{ license_response.json.message | default('') in [
'This installation is currently running Cloudera Express.',
Expand All @@ -46,15 +47,13 @@
quiet: yes

- name: Post license file to Cloudera Manager API
shell: >
ansible.builtin.shell: >
curl
--user {{ cloudera_manager_api_user }}:{{ cloudera_manager_api_password }}
--request POST
--header 'Content-Type:multipart/form-data'
--form license=@{{ license_local_tmp_path }}
{{ license_response.url }}
args:
warn: False
register: response
failed_when: "'owner' not in response.stdout"
when: license_not_installed
6 changes: 2 additions & 4 deletions roles/cloudera_manager/repo/tasks/main-RedHat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
---

- name: Add Cloudera Manager yum repository
yum_repository:
ansible.builtin.yum_repository:
name: cloudera-manager
description: Cloudera Manager
baseurl: "{{ cloudera_manager_repo_url }}"
Expand All @@ -26,6 +26,4 @@
password: "{{ cloudera_manager_repo_password | default('') }}"

- name: yum-clean-metadata
command: yum clean metadata
args:
warn: no
ansible.builtin.command: yum clean metadata

0 comments on commit 305c285

Please sign in to comment.