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.

Sign up for GitHub

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

added variable hostname_var: can be set to 'ansible_fqdn' (use the internal hostname) or… #31

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

added variable hostname_var: can be set to 'ansible_fqdn' (use the internal hostname) or… #31

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
359833d
added variable hostname_var: can be set to 'ansible_fqdn' (to use the…
lhoss May 9, 2019
3dc6be2
use scm_hostname var only (without hostvars dict)
lhoss May 15, 2019
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
3 changes: 3 additions & 0 deletions group_vars/all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@ ad_domain: "{{ krb5_realm.lower() }}"
computer_ou: ou=Hosts,ou=morhidi,ou=HadoopClusters,ou=morhidi,dc=ad,dc=sec,dc=cloudera,dc=com
domain: vpc.cloudera.com
kdc: w2k8-1.ad.sec.cloudera.com

# hostname_var can be set to 'ansible_fqdn' (to use the internal hostname) or 'inventory_hostname' (default, uses the public/inventory hostname)
hostname_var: 'inventory_hostname'
2 changes: 1 addition & 1 deletion roles/cdh/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
- debug: msg="Import cluster template command ID - {{ command_id }}"
when: cluster_exists == False

- debug: msg="Login to Cloudera Manager to monitor import progress - http://{{ hostvars[scm_hostname]['inventory_hostname'] }}:{{ scm_port }}/cmf/commands/commands"
- debug: msg="Login to Cloudera Manager to monitor import progress - http://{{ hostvars[scm_hostname][hostname_var] }}:{{ scm_port }}/cmf/commands/commands"
when: cluster_exists == False

- file:
Expand Down
2 changes: 1 addition & 1 deletion roles/cdh/templates/hive.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"serviceConfigs": [
{
"name": "hive_metastore_database_host",
"value": "{{ hostvars[db_hostname]['inventory_hostname'] }}"
"value": "{{ hostvars[db_hostname][hostname_var] }}"
}, {
"name": "hive_metastore_database_type",
"value": "{{ databases.metastore.type }}"
Expand Down
2 changes: 1 addition & 1 deletion roles/cdh/templates/hue.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"serviceConfigs": [
{
"name": "database_host",
"value": "{{ hostvars[db_hostname]['inventory_hostname'] }}"
"value": "{{ hostvars[db_hostname][hostname_var] }}"
}, {
"name": "database_type",
"value": "{{ databases.hue.type }}"
Expand Down
2 changes: 1 addition & 1 deletion roles/cdh/templates/oozie.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"configs": [
{
"name": "oozie_database_host",
"value": "{{ hostvars[db_hostname]['inventory_hostname'] }}"
"value": "{{ hostvars[db_hostname][hostname_var] }}"
}, {
"name": "oozie_database_type",
"value": "{{ databases.oozie.type }}"
Expand Down
2 changes: 1 addition & 1 deletion roles/cdh/templates/sentry.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"serviceConfigs": [
{
"name": "sentry_server_database_host",
"value": "{{ hostvars[db_hostname]['inventory_hostname'] }}"
"value": "{{ hostvars[db_hostname][hostname_var] }}"
}, {
"name": "sentry_server_database_type",
"value": "{{ databases.sentry.type }}"
Expand Down
2 changes: 1 addition & 1 deletion roles/cm_agents/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
- cloudera-manager-agent

- name: Configure Cloudera Manager Agent 'server_host'
lineinfile: dest=/etc/cloudera-scm-agent/config.ini regexp=^server_host line=server_host={{ hostvars[scm_hostname]['inventory_hostname'] }}
lineinfile: dest=/etc/cloudera-scm-agent/config.ini regexp=^server_host line=server_host={{ hostvars[scm_hostname][hostname_var] }}

- name: Restart Cloudera Manager Agents
service: name=cloudera-scm-agent state=restarted enabled=yes
4 changes: 2 additions & 2 deletions roles/krb5_server/templates/krb5.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

[realms]
{{ default_realm|upper }} = {
kdc = {{ hostvars[groups['krb5_server'][0]]['inventory_hostname'] }}
admin_server = {{ hostvars[groups['krb5_server'][0]]['inventory_hostname'] }}
kdc = {{ hostvars[groups['krb5_server'][0]][hostname_var] }}
admin_server = {{ hostvars[groups['krb5_server'][0]][hostname_var] }}
default_domain = {{ ansible_fqdn.split('.')[1:]|join('.') }}
}

Expand Down
5 changes: 3 additions & 2 deletions roles/scm/handlers/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@

- name: wait cloudera-scm-server
wait_for:
host={{ hostvars[scm_hostname]['inventory_hostname'] }}
host={{ hostvars[scm_hostname][hostname_var] }}
lhoss marked this conversation as resolved.
Show resolved Hide resolved
port={{ scm_port }}
delay=5
state=started
timeout=300
timeout=300

6 changes: 3 additions & 3 deletions roles/scm/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
- name: Prepare Cloudera Manager Server External Database
command: /usr/share/cmf/schema/scm_prepare_database.sh
-f
--host {{ hostvars[db_hostname]['inventory_hostname'] }}
--host {{ hostvars[db_hostname][hostname_var] }}
mysql {{ databases.scm.name }} {{ databases.scm.user }} {{ databases.scm.pass }}
changed_when: False

Expand All @@ -29,7 +29,7 @@

- name: Get Cloudera Manager API version
uri:
url: http://{{ hostvars[scm_hostname]['inventory_hostname'] }}:{{ scm_port }}/api/version
url: http://{{ hostvars[scm_hostname][hostname_var] }}:{{ scm_port }}/api/version
Copy link
Contributor Author

Choose a reason for hiding this comment

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

actually here even better to just use scm_hostname:

    url: http://{{ scm_hostname }}:{{ scm_port }}/api/version

method: GET
status_code: 200
user: "{{ scm_default_user }}"
Expand All @@ -39,7 +39,7 @@
register: result

# Set base CM API URL
- set_fact: cm_api_url="http://{{ hostvars[scm_hostname]['inventory_hostname'] }}:{{ scm_port }}/api/{{ result.content }}"
- set_fact: cm_api_url="http://{{ hostvars[scm_hostname][hostname_var] }}:{{ scm_port }}/api/{{ result.content }}"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

IDEM: actually here even better to just use scm_hostname

- debug: var=cm_api_url

# Install Cloudera Manager Python API
Expand Down
8 changes: 4 additions & 4 deletions roles/scm/templates/cms_base.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"items": [
{
"name": "firehose_database_host",
"value": "{{ hostvars[db_hostname]['inventory_hostname'] }}"
"value": "{{ hostvars[db_hostname][hostname_var] }}"
}, {
"name": "firehose_database_name",
"value": "{{ databases.amon.name }}"
Expand Down Expand Up @@ -105,7 +105,7 @@
"items": [
{
"name": "headlamp_database_host",
"value": "{{ hostvars[db_hostname]['inventory_hostname'] }}"
"value": "{{ hostvars[db_hostname][hostname_var] }}"
}, {
"name": "headlamp_database_name",
"value": "{{ databases.rman.name }}"
Expand Down Expand Up @@ -133,7 +133,7 @@
"items": [
{
"name": "navigator_database_host",
"value": "{{ hostvars[db_hostname]['inventory_hostname'] }}"
"value": "{{ hostvars[db_hostname][hostname_var] }}"
}, {
"name": "navigator_database_name",
"value": "{{ databases.nav.name }}"
Expand Down Expand Up @@ -161,7 +161,7 @@
"items": [
{
"name": "nav_metaserver_database_host",
"value": "{{ hostvars[db_hostname]['inventory_hostname'] }}"
"value": "{{ hostvars[db_hostname][hostname_var] }}"
}, {
"name": "nav_metaserver_database_name",
"value": "{{ databases.navms.name }}"
Expand Down
2 changes: 1 addition & 1 deletion roles/scm/templates/scm.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% if krb5_kdc_type != 'none' %}
{
"name" : "KDC_HOST",
"value" : "{{ hostvars[groups['krb5_server'][0]]['inventory_hostname'] }}"
"value" : "{{ hostvars[groups['krb5_server'][0]][hostname_var] }}"
}, {
"name" : "KDC_TYPE",
{% if krb5_kdc_type == 'ad' %}
Expand Down