x/browbeat
Code Issues Proposed changes

Switch to ansible_fqdn for Kibana

Browse Source 
Changes ansible_hosname references to ansible_fqdn
if a fqdn is not properly specified ansible will fall
back to ansible_hostname. On properly setup machines
this will give a copy/paste link to the dashbaord and such

Change-Id: Id0b41d4b829b70aae27856b374ae027afe860fbc
This commit is contained in:
jkilpatr 2016-07-25 13:59:19 -04:00
parent 1e1f68d75c
commit 4de213ca83
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ansible/install/roles/kibana/tasks/main.yml
View File

@ -97,7 +97,7 @@
register: filebeat_forwarder_ssl_exists register: filebeat_forwarder_ssl_exists
- name: Create client forwarder SSL certificate - name: Create client forwarder SSL certificate
command: openssl req -subj '/CN={{ ansible_hostname }}/' -config /etc/pki/tls/openssl_extras.cnf \ command: openssl req -subj '/CN={{ ansible_fqdn }}/' -config /etc/pki/tls/openssl_extras.cnf \
-x509 -days 3650 -batch -nodes -newkey rsa:2048 -keyout /etc/pki/tls/private/filebeat-forwarder.key \ -x509 -days 3650 -batch -nodes -newkey rsa:2048 -keyout /etc/pki/tls/private/filebeat-forwarder.key \
-out /etc/pki/tls/certs/filebeat-forwarder.crt -out /etc/pki/tls/certs/filebeat-forwarder.crt
ignore_errors: true ignore_errors: true
@ -125,14 +125,14 @@
become: true become: true
- name: Print SSL post-setup information - name: Print SSL post-setup information
debug: msg="Filebeat SSL Certificate available at http://{{ ansible_hostname }}:{{ elk_server_ssl_cert_port }}/filebeat-forwarder.crt" debug: msg="Filebeat SSL Certificate available at http://{{ ansible_fqdn }}:{{ elk_server_ssl_cert_port }}/filebeat-forwarder.crt"
when: (logging_backend != 'fluentd') when: (logging_backend != 'fluentd')
- name: Print post-setup URL - name: Print post-setup URL
debug: msg="*** ELK Services available at http://{{ ansible_hostname }}:{{ nginx_kibana_port }} ***" debug: msg="*** ELK Services available at http://{{ ansible_fqdn }}:{{ nginx_kibana_port }} ***"
- name: Print index creation instructions - name: Print index creation instructions
debug: msg="** 1) Navigate to http://{{ ansible_hostname }}:{{ nginx_kibana_port }} and login with admin/admin, click 'create' on the green index button ***" debug: msg="** 1) Navigate to http://{{ ansible_fqdn }}:{{ nginx_kibana_port }} and login with admin/admin, click 'create' on the green index button ***"
- name: Print filebeat openstack client setup instructions - name: Print filebeat openstack client setup instructions
debug: msg="** 2) Run ansible-playbook -i hosts install/elk-openstack-client.yml --extra-vars 'elk_server={{ ansible_default_ipv4.address }}' to setup OpenStack clients ***" debug: msg="** 2) Run ansible-playbook -i hosts install/elk-openstack-client.yml --extra-vars 'elk_server={{ ansible_default_ipv4.address }}' to setup OpenStack clients ***"