Fix up some issues.

metron-deployment/amazon-ec2/playbook.yml

@@ -29,7 +29,7 @@
     - include: tasks/create-hosts.yml host_count=1 host_type=sensors,ambari_master,ec2,monit
     - include: tasks/create-hosts.yml host_count=4 host_type=ambari_slave,ec2
     - include: tasks/create-hosts.yml host_count=1 host_type=pcap_server,monit,ec2
-    - include: tasks/create-hosts.yml host_count=1 host_type=ambari_slave,enrichment,search,metron,ec2,zeppelin
+    - include: tasks/create-hosts.yml host_count=1 host_type=ambari_slave,enrichment,metron,ec2,zeppelin
     - include: tasks/create-hosts.yml host_count=2 host_type=ambari_slave,search,ec2
     - include: tasks/create-hosts.yml host_count=1 host_type=ambari_slave,web,ec2
   tags:

metron-deployment/playbooks/ambari_install.yml

@@ -57,7 +57,7 @@
 - hosts: metron
   become: true
   roles:
-    - role: metron
+    - role: metron-rpms
   tags:
     - metron-deploy
 

metron-deployment/playbooks/metron_install.yml

@@ -65,6 +65,13 @@
   tags:
     - sensor-stubs
 
+- hosts: metron
+  become: true
+  roles:
+    - role: metron-rpms
+  tags:
+    - copy-rpms
+
 #
 # monitor and start metron services with monit
 #

metron-deployment/roles/ambari_config/vars/small_cluster.yml

@@ -88,14 +88,14 @@ configurations:
   - elastic-site:
       index_number_of_shards: 2
       index_number_of_replicas: 1
-      zen_discovery_ping_unicast_hosts: "{{ groups.search | join(',') }},{{ groups.web[0] }}"
+      zen_discovery_ping_unicast_hosts: "{{ groups.web[0] }},{{ groups.search | join(',') }}"
       gateway_recover_after_data_nodes: 1
       network_host: _lo_,_{{ elasticsearch_network_interface }}_
 
 required_configurations:
   - metron-env:
       storm_rest_addr: "{{ groups.ambari_slave[1] }}:8744"
-      es_hosts: "{{ groups.search | join(',') }},{{ groups.web[0] }}"
+      es_hosts: "{{ groups.web[0] }},{{ groups.search | join(',') }}"
       zeppelin_server_url: "{{ groups.zeppelin[0] }}"
   - kibana-env:
       kibana_pid_dir: /var/run/kibana

metron-deployment/roles/load_web_templates/tasks/main.yml

@@ -17,12 +17,16 @@
 ---
 - name: Load ES Templates
   command: >
-    curl -u admin:admin -H "X-Requested-By: ambari" -X POST -d '{ "RequestInfo": { "context": "Install ES Template from REST", "command": "ELASTICSEARCH_TEMPLATE_INSTALL"},"Requests/resource_filters": [{"service_name": "METRON","component_name": "METRON_INDEXING","hosts" : "{{ metron_hosts[0] }}"}]}' http://{{ groups.ambari_master[0] }}:{{ ambari_port }}/api/v1/clusters/metron_cluster/requests
+    curl -s -w "%{http_code}" -u admin:admin -H "X-Requested-By: ambari" -X POST -d '{ "RequestInfo": { "context": "Install ES Template from REST", "command": "ELASTICSEARCH_TEMPLATE_INSTALL"},"Requests/resource_filters": [{"service_name": "METRON","component_name": "METRON_INDEXING","hosts" : "{{ metron_hosts[0] }}"}]}' http://{{ groups.ambari_master[0] }}:{{ ambari_port }}/api/v1/clusters/{{ cluster_name }}/requests
   args:
     warn: off
+  register: result
+  failed_when: "result.rc != 0 or '202' not in result.stdout"
 
 - name: Load Kibana Dashboard
   command: >
-    curl -u admin:admin -H "X-Requested-By: ambari" -X POST -d '{ "RequestInfo": { "context": "Install Kibana Dashboard from REST", "command": "LOAD_TEMPLATE"},"Requests/resource_filters": [{"service_name": "KIBANA","component_name": "KIBANA_MASTER","hosts" : "{{ kibana_hosts[0] }}"}]}' http://{{ groups.ambari_master[0] }}:{{ ambari_port }}/api/v1/clusters/metron_cluster/requests
+    curl -s -w "%{http_code}" -u admin:admin -H "X-Requested-By: ambari" -X POST -d '{ "RequestInfo": { "context": "Install Kibana Dashboard from REST", "command": "LOAD_TEMPLATE"},"Requests/resource_filters": [{"service_name": "KIBANA","component_name": "KIBANA_MASTER","hosts" : "{{ kibana_hosts[0] }}"}]}' http://{{ groups.ambari_master[0] }}:{{ ambari_port }}/api/v1/clusters/{{ cluster_name }}/requests
   args:
     warn: off
+  register: result
+  failed_when: "result.rc != 0 or '202' not in result.stdout"