Merge "Updating the DPDK Version to 18.11 (Latest Stable Release) and respective...

diff --git a/INFO b/INFO
index cb0a34d..f3e2edf 100644 (file)
--- a/INFO
+++ b/INFO
@@ -3,7 +3,7 @@ Project Creation Date:
 Project Category:
 Lifecycle State:
 Primary Contact:
-Project Lead: mrunge@redhat.com
+Project Lead: efoley@redhat.com
 Jira Project Name: barometer
 Jira Project Prefix: barometer
 Mailing list tag: []
@@ -16,7 +16,7 @@ bruce.richardson@intel.com
 thomas.monjalon@6wind.com
 acmorton@att.com
 aasmith@redhat.com
-emma.l.foley@intel.com
+efoley@redhat.com
 calin.gherghe@intel.com
 mrunge@redhat.com
 

diff --git a/INFO.yaml b/INFO.yaml
index 0400804..9530fb1 100644 (file)
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -4,11 +4,11 @@ project_creation_date: ''
 project_category: ''
 lifecycle_state: ''
 project_lead: &opnfv_barometer_ptl
-    name: 'Matthias Runge'
-    email: 'mrunge@redhat.com'
-    id: 'mrunge'
+    name: 'Emma Foley'
+    email: 'efoley@redhat.com'
+    id: 'efoley'
     company: 'redhat.com'
-    timezone: 'Europe/Berlin'
+    timezone: 'Europe/Dublin'
 primary_contact: *opnfv_barometer_ptl
 issue_tracking:
     type: 'jira'
@@ -48,13 +48,17 @@ committers:
       company: 'att.com'
       id: 'acm'
     - name: 'Emma Foley'
-      email: 'emma.l.foley@intel.com'
-      company: 'intel.com'
+      email: 'efoley@redhat.com'
+      company: 'redhat.com'
       id: 'elfoley'
     - name: 'Aaron Smith'
       email: 'aasmith@redhat.com'
       company: 'redhat.com'
       id: 'TsaLaGi'
+    - name: 'Matthias Runge'
+      email: 'mrunge@redhat.com'
+      company: 'redhat.com'
+      id: 'mrunge'
 tsc:
     # yamllint disable rule:line-length
     approval: ''

diff --git a/docker/ansible/default.inv b/docker/ansible/default.inv
index 45c3656..e254c26 100644 (file)
--- a/docker/ansible/default.inv
+++ b/docker/ansible/default.inv
@@ -23,8 +23,8 @@ flavor=stable
 #hostname
 
 [grafana_hosts]
-#hostname
 #NOTE: As per current support, Grafana and Influxdb should be same host.
+#hostname
 
 [prometheus_hosts]
 #localhost

diff --git a/docs/release/userguide/collectd.ves.userguide.rst b/docs/release/userguide/collectd.ves.userguide.rst
index f56acbc..b961dd5 100644 (file)
--- a/docs/release/userguide/collectd.ves.userguide.rst
+++ b/docs/release/userguide/collectd.ves.userguide.rst
@@ -368,7 +368,7 @@ REST resources are of the form::
     {ServerRoot}/eventListener/v{apiVersion}/{topicName}`
     {ServerRoot}/eventListener/v{apiVersion}/eventBatch`
 
-Within the VES directory (``3rd_party/collectd-ves-app/ves_app``) there is a
+Within the VES directory (``3rd_party/collectd-ves-app/ves_app/config``) there is a
 configuration file called ``ves_app_conf.conf``. The description of the
 configuration options are described below:
 

diff --git a/docs/release/userguide/installguide.oneclick.rst b/docs/release/userguide/installguide.oneclick.rst
index c935950..9475e1a 100644 (file)
--- a/docs/release/userguide/installguide.oneclick.rst
+++ b/docs/release/userguide/installguide.oneclick.rst
@@ -191,6 +191,7 @@ Configure ssh keys
 ^^^^^^^^^^^^^^^^^^
 
 Generate ssh keys if not present, otherwise move onto next step.
+ssh keys are required for Ansible to connect the host you use for Barometer Installation.
 
 .. code:: bash