Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Patch] Compatibility bug when boolean compare and post requests #138

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions playbooks/roles/ambari-blueprint/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
- block:
- name: Get the VersionDefinition id from Ambari (Ambari >= 2.6)
uri:
url: "http://{{ ansible_fqdn }}:8080/api/v1/version_definitions?VersionDefinition/release/version={{ (install_hdp|default(false) == true) | ternary(hdp_version,hdf_version) }}"
url: "http://{{ ansible_fqdn }}:8080/api/v1/version_definitions?VersionDefinition/release/version={{ install_hdp|default(false) | ternary(hdp_version,hdf_version) }}"
method: GET
force_basic_auth: yes
user: "{{ ambari_admin_user }}"
Expand Down Expand Up @@ -94,7 +94,7 @@
user: "{{ ambari_admin_user }}"
password: "{{ ambari_admin_password }}"
headers: '{"X-Requested-By":"ambari"}'
body: "{{ cluster_blueprint|to_json }} "
body: " {{ cluster_blueprint|to_json }}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So actually the space wasn't removed, but just moved from a trailing space to a prefixed one.
@agriffaut does this change anything?
and it's not working without space at all?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's not working with some specific edge cases (combinations of ambari and ansible versions), I'd like to keep that space for now unless there's proof it's causing an issue. I'll try ansible 2.5.4 but honestly ansible versions have moved since then so not really a priority. A simple fix would be to set ansible 2.6 as the required version :) https://github.com/hortonworks/ansible-hortonworks#requirements

body_format: raw
status_code: 200,201,202,409
timeout: 60
Expand All @@ -108,7 +108,7 @@
user: "{{ ambari_admin_user }}"
password: "{{ ambari_admin_password }}"
headers: '{"X-Requested-By":"ambari"}'
body: "{{ cluster_template|to_json }} "
body: " {{ cluster_template|to_json }}"
body_format: raw
status_code: 200,201,202
timeout: 120
Expand Down
6 changes: 3 additions & 3 deletions playbooks/roles/ambari-config/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
backup: no
state: present
regexp: "^gpl.license.accepted.*"
line: "gpl.license.accepted={{ (accept_gpl|default(omit)|bool == true) | ternary('true', 'false') }}"
line: "gpl.license.accepted={{ accept_gpl|default(omit)|bool | ternary('true', 'false') }}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not simply :

gpl.license.accepted={{ accept_gpl }}
or
gpl.license.accepted={{ accept_gpl |default('true') }}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it covers more edge cases, not sure what you're trying to solve here...

notify: Restart ambari-server

- name: Attempt to change the default Ambari admin password
Expand Down Expand Up @@ -169,7 +169,7 @@
- ../templates
when: ambari_version is version_compare('2.6', '>=')

- name: Enable User Home Directory Creation
- name: Enable User Home Directory Creation
lineinfile:
path: /etc/ambari-server/conf/ambari.properties
state: present
Expand All @@ -183,7 +183,7 @@
- block:
- name: Attempt to get an existing VDF for the required version (Ambari >= 2.6)
uri:
url: "http://{{ ansible_fqdn }}:8080/api/v1/version_definitions?VersionDefinition/release/version={{ (install_hdp|default(false) == true) | ternary(hdp_version,hdf_version) }}"
url: "http://{{ ansible_fqdn }}:8080/api/v1/version_definitions?VersionDefinition/release/version={{ install_hdp|default(false) | ternary(hdp_version,hdf_version) }}"
method: GET
force_basic_auth: yes
user: "{{ ambari_admin_user }}"
Expand Down