Updates to metadata

+ Move metadata to its own .gitignore-d directory
+ Add elasticsearch configuration to other browbeat config files in conf/
+ Adjustments to base .gitignore to ignore ansible retry files and removing legacy pbench-hosts-file

Change-Id: I7e3205f070e5f66e508cb486ae2306d28d4982bd

.gitignore

@@ -1,8 +1,10 @@
 *.py[cod]
 
+# Ansible files
+*.retry
+
 # Prevent hosts files from sneaking into the git repo
 ansible/hosts
-ansible/pbench-host-file
 
 log/*
 

ansible/gather/site.yml

@@ -26,8 +26,6 @@
   become: true
   tasks:
   - name: Dump all vars
-    local_action: template src=dump_facts.j2 dest={{ browbeat_path }}/machine_facts.json
+    local_action: template src=dump_facts.j2 dest={{ browbeat_path }}/metadata/machine_facts.json
   - name: Generate metadata jsons
-    shell : python {{ browbeat_path }}/lib/Metadata.py {{ browbeat_path }}
-
-
+    shell : python {{ browbeat_path }}/lib/Metadata.py {{ browbeat_path }}/metadata

browbeat-complete.yaml

@@ -8,11 +8,11 @@ elasticsearch:
   port: 9200
   metadata_files:
     - name: hardware-metadata
-      file: hardware-metadata.json
-    - name: os-metadata
-      file: os-metadata.json
+      file: metadata/hardware-metadata.json
+    - name: environment-metadata
+      file: metadata/environment-metadata.json
     - name: software-metadata
-      file: software-metadata.json
+      file: metadata/software-metadata.json
 ansible:
   hosts: ansible/hosts
   adjust:

browbeat-config.yaml

@@ -8,11 +8,11 @@ elasticsearch:
   port: 9200
   metadata_files:
     - name: hardware-metadata
-      file: hardware-metadata.json
-    - name: os-metadata
-      file: os-metadata.json
+      file: metadata/hardware-metadata.json
+    - name: environment-metadata
+      file: metadata/environment-metadata.json
     - name: software-metadata
-      file: software-metadata.json
+      file: metadata/software-metadata.json
 ansible:
   hosts: ansible/hosts
   adjust:

conf/browbeat-keystone-complete.yaml

@@ -3,6 +3,17 @@
 browbeat:
   results : results/
   rerun: 3
+elasticsearch:
+  enabled: false
+  host: 1.1.1.1
+  port: 9200
+  metadata_files:
+    - name: hardware-metadata
+      file: metadata/hardware-metadata.json
+    - name: environment-metadata
+      file: metadata/environment-metadata.json
+    - name: software-metadata
+      file: metadata/software-metadata.json
 ansible:
   hosts: ansible/hosts
   adjust:

conf/browbeat-keystone-minimal.yaml

@@ -3,6 +3,17 @@
 browbeat:
   results : results/
   rerun: 1
+elasticsearch:
+  enabled: false
+  host: 1.1.1.1
+  port: 9200
+  metadata_files:
+    - name: hardware-metadata
+      file: metadata/hardware-metadata.json
+    - name: environment-metadata
+      file: metadata/environment-metadata.json
+    - name: software-metadata
+      file: metadata/software-metadata.json
 ansible:
   hosts: ansible/hosts
   adjust:

conf/browbeat-perfkit-complete.yaml

@@ -2,6 +2,17 @@
 browbeat:
   results : results/
   rerun: 3
+elasticsearch:
+  enabled: false
+  host: 1.1.1.1
+  port: 9200
+  metadata_files:
+    - name: hardware-metadata
+      file: metadata/hardware-metadata.json
+    - name: environment-metadata
+      file: metadata/environment-metadata.json
+    - name: software-metadata
+      file: metadata/software-metadata.json
 ansible:
   hosts: ansible/hosts
   adjust:

metadata/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory (placeholder directory)
+*
+# Except this file
+!.gitignore