Browbeat to use fs001 of stockpile and minor bugfix in prescribe

1. Browbeat shall make use of the fs001 which is the targetted version
   of stockpile, thus it won't run all roles against all hosts.
2. Also updated the bug where node_name wasn't added to dictionary when 
   prescribe first hits data that was gathered from outside config file.

Change-Id: Ieac2c090713b307b4971aee3fd4d5b24f14b9fc9

ansible/gather/stockpile.yml

@@ -2,11 +2,24 @@
 
 - hosts: stockpile
   tasks:
-    - name: setting fact for metadata folder
+    - name: setting facts needed
       set_fact:
         md_output_path: "{{ browbeat_path }}/metadata/machine_facts.json"
+        stockpile_user: "{{ browbeat_user }}"
 
-- import_playbook: stockpile/stockpile.yml
+- hosts: overcloud
+  tasks:
+    - name: setting facts
+      set_fact:
+        overcloud_user: "{{ host_remote_user }}"
+
+- hosts: undercloud
+  tasks:
+    - name: setting facts
+      set_fact:
+        undercloud_user: "{{ local_remote_user }}"
+
+- import_playbook: stockpile/config/featureset001.yml
   vars:
     stockpile_output_path: "{{ md_output_path }}"
 
@@ -14,3 +27,4 @@
   tasks:
     - name: run prescribe
       command: python {{ browbeat_path }}/browbeat/prescribe.py {{ browbeat_path }}/metadata
+

browbeat/prescribe.py

@@ -110,6 +110,7 @@ class Metadata(object):
                                 key_name = service[1]
                                 if service_name not in software_dict.keys():
                                     software_dict[service_name] = {}
+                                    software_dict[service_name]['node_name'] = node
                                 if key_name not in software_dict[service_name].keys():
                                     software_dict[service_name][key_name] = {}
                                 for obj, value in output.iteritems():

doc/source/contributing.rst

@@ -146,6 +146,7 @@ See the README.rst in the ci-scripts folder for more details on the structure of
 Contributing to stockpile
 -------------------------
 
-We currently use `stockpile <https://github.com/redhat-performance/stockpile>`_
+We currently use `featureset001 <https://github.com/redhat-performance/stockpile/blob/master/config/featureset001.yml>`_ of
+`stockpile <https://github.com/redhat-performance/stockpile>`_
 to gather config. Please follow `instructions <https://github.com/redhat-performance/stockpile#contributing>`_
 to contribute to stockpile.