diff options
| -rw-r--r-- | docker/ansible/roles/config_files/tasks/ipmi.yml | 2 | ||||
| -rw-r--r-- | docs/release/userguide/docker.userguide.rst | 6 | ||||
| -rw-r--r-- | src/collectd/Makefile | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/docker/ansible/roles/config_files/tasks/ipmi.yml b/docker/ansible/roles/config_files/tasks/ipmi.yml index da3f42bd..5ea62c47 100644 --- a/docker/ansible/roles/config_files/tasks/ipmi.yml +++ b/docker/ansible/roles/config_files/tasks/ipmi.yml @@ -38,7 +38,7 @@ - name: enable ipmi plugin template: src: ipmi.conf.j2 - dest: "{{ config_file_dir }}/ipmi.conf" + dest: "{{ config_file_dir }}/0_ipmi.conf" when: ipmi0_exists|succeeded and ipmi_devintf|succeeded and ipmi_devsi|succeeded tags: - ipmi diff --git a/docs/release/userguide/docker.userguide.rst b/docs/release/userguide/docker.userguide.rst index 33e060af..b42230e8 100644 --- a/docs/release/userguide/docker.userguide.rst +++ b/docs/release/userguide/docker.userguide.rst @@ -427,7 +427,7 @@ Run the InfluxDB docker image ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ .. code:: bash - $ sudo docker run -tid --net=host -v /var/lib/influxdb:/var/lib/influxdb -p 8086:8086 -p 25826:25826 opnfv/barometer-influxdb + $ sudo docker run -tid -v /var/lib/influxdb:/var/lib/influxdb -p 8086:8086 -p 25826:25826 opnfv/barometer-influxdb Check your docker image is running @@ -448,7 +448,7 @@ Connecting to an influxdb instance running on local system and adding own custom .. code:: bash - $ sudo docker run -tid --net=host -v /var/lib/grafana:/var/lib/grafana -v ${PWD}/dashboards:/opt/grafana/dashboards \ + $ sudo docker run -tid -v /var/lib/grafana:/var/lib/grafana -v ${PWD}/dashboards:/opt/grafana/dashboards \ -p 3000:3000 opnfv/barometer-grafana Connecting to an influxdb instance running on remote system with hostname of someserver and IP address @@ -456,7 +456,7 @@ of 192.168.121.111 .. code:: bash - $ sudo docker run -tid --net=host -v /var/lib/grafana:/var/lib/grafana -p 3000:3000 -e \ + $ sudo docker run -tid -v /var/lib/grafana:/var/lib/grafana -p 3000:3000 -e \ influxdb_host=someserver --add-host someserver:192.168.121.111 opnfv/barometer-grafana Check your docker image is running diff --git a/src/collectd/Makefile b/src/collectd/Makefile index 04791634..7d306528 100644 --- a/src/collectd/Makefile +++ b/src/collectd/Makefile @@ -49,6 +49,7 @@ CONFIG_CMD += --enable-python CONFIG_CMD += --enable-threshold CONFIG_CMD += --disable-perl CONFIG_CMD += --with-librdkafka=/usr +CONFIG_CMD += --disable-lvm .PHONY: install force_install config force_make |