Allow for a converged elk deployment

If kibana and elastic-logstash are the same node the deployment needs to
allow for storage nodes to co-exist with the front-end.

Change-Id: Icf9d26fefe015bd39f16387b4934e573783ed1ea
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>

elk_metrics_6x/installAuditbeat.yml

@@ -44,18 +44,10 @@
         src: templates/auditbeat.yml.j2
         dest: /etc/auditbeat/auditbeat.yml
 
-    - name: Stop auditd
-      systemd:
-        name: "auditd"
-        enabled: "{{ not inventory_hostname in groups['kibana'] | default([]) }}"
-        state: stopped
-      when:
-        - not apply_security_hardening | default(true) | bool
-
     - name: Enable and restart auditbeat
       systemd:
         name: "auditbeat"
-        enabled: "{{ not inventory_hostname in groups['kibana'] | default([]) }}"
+        enabled: "true"
         state: restarted
 
   tags:

elk_metrics_6x/installElastic.yml

@@ -35,7 +35,7 @@
             elasticsearch_node_ingest: false
             elastic_heap_size: "{{ (elastic_heap_size | int) // 3 }}"
       when:
-        - inventory_hostname in groups['kibana']
+        - inventory_hostname in (groups['kibana'] | difference(groups['elastic-logstash']))
       tags:
         - always