Merge "docker.userguide: Add a note about bar-collectd run without DPDK/RDT" into...

diff --git a/docker/ansible/default.inv b/docker/ansible/default.inv
index 45d9fa0..a5a092d 100644 (file)
--- a/docker/ansible/default.inv
+++ b/docker/ansible/default.inv
@@ -6,16 +6,18 @@ install_mcelog=true
 insert_ipmi_modules=true
 
 [influxdb_hosts]
-#localhost
+#hostname or ip must be used.
+#using localhost will cause issues with collectd network plugin.
+#hostname
 
 [grafana_hosts]
-#localhost
+#hostname
 
 [prometheus_hosts]
 #localhost
 
 [kafka_hosts]
-#localhost
+#hostname
 
 [ves_hosts]
-#localhost
+#hostname

diff --git a/docker/ansible/roles/config_files/tasks/network.yml b/docker/ansible/roles/config_files/tasks/network.yml
index dca0c23..52902d4 100644 (file)
--- a/docker/ansible/roles/config_files/tasks/network.yml
+++ b/docker/ansible/roles/config_files/tasks/network.yml
@@ -13,9 +13,28 @@
 # limitations under the License.
 ---
 
-- name: enable network plugin
+- name: Enable network plugin
   template:
     src: network.conf.j2
     dest: "{{ config_file_dir }}/network.conf"
   tags:
      - network
+
+- name: Add network port if defined
+  lineinfile:
+    dest: "{{ config_file_dir }}/network.conf"
+    insertafter: Plugin network
+    line: "    Server \"{{ network_ip_addr }}\" \"{{ network_port }}\""
+  when: network_ip_addr is defined
+  tags:
+   - network
+
+- name: Modify network.conf to add influxdb_hosts
+  lineinfile:
+    dest: "{{ config_file_dir }}/network.conf"
+    insertafter: Plugin network
+    line: "    Server \"{{ item }}\" \"{{ influx_network_port }}\""
+  with_items: "{{ groups['influxdb_hosts'] }}"
+  tags:
+   - network
+

diff --git a/docker/ansible/roles/config_files/templates/network.conf.j2 b/docker/ansible/roles/config_files/templates/network.conf.j2
index 3d940e8..c89a18e 100644 (file)
--- a/docker/ansible/roles/config_files/templates/network.conf.j2
+++ b/docker/ansible/roles/config_files/templates/network.conf.j2
@@ -14,7 +14,7 @@
 
 LoadPlugin  network
 
+#this is auto-filled using ansible script
 <Plugin network>
-    Server "{{ network_ip_addr }}" "{{ network_port }}"
 </Plugin>
 

diff --git a/docker/ansible/roles/config_files/vars/main.yml b/docker/ansible/roles/config_files/vars/main.yml
index cbe64b3..f12492a 100644 (file)
--- a/docker/ansible/roles/config_files/vars/main.yml
+++ b/docker/ansible/roles/config_files/vars/main.yml
@@ -21,12 +21,12 @@ logfile_dir: "/var/log/"
 #global default interval
 interval_value: 10
 
+#influx network port
+influx_network_port: 25826
+
 #network plugin vars
-network_port: 25826
-#get influxdb name as defined in inventory
-influxdb_hostname: "{{ (groups['influxdb_hosts']|default({}))[0] | default('localhost') }}"
-#get hostname as used by ansible
-network_ip_addr: "{{ hostvars[influxdb_hostname].ansible_hostname }}"
+#network_port: 25826
+#network_ip_addr: localhost
 
 #prometheus plugin vars
 prometheus_port: 9103

diff --git a/requirements.txt b/requirements.txt
index 57a2f51..55e2f3c 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,9 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-paramiko # LGPLv2.1+
-requests # Apache-2.0
-python-keystoneclient!=2.1.0 # Apache-2.0
+paramiko>=2.0.0 # LGPLv2.1+
+requests>=2.14.2 # Apache-2.0
+python-keystoneclient>=3.8.0 # Apache-2.0
 toml # MIT
 opnfv # Apache-2.0
 functest # Apache-2.0