4 files changed, 73 insertions, 0 deletions

diff --git a/ansible/roles/barometer_collectd/tasks/main.yaml b/ansible/roles/barometer_collectd/tasks/main.yaml
new file mode 100644
index 000000000..c06540c3f
--- /dev/null
+++ b/ansible/roles/barometer_collectd/tasks/main.yaml
@@ -0,0 +1,40 @@
+#Copyright 2018 OPNFV and Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+---
+
+- name: Remove barometer-collectd container
+  docker_container:
+    name: barometer-collectd
+    state: absent
+
+- name: Remove barometer-collectd image
+  docker_image:
+    name: opnfv/barometer-collectd
+    state: absent
+
+- name: Prepare collectd container
+  docker_container:
+    name: barometer-collectd
+    image: opnfv/barometer-collectd
+    volumes:
+       - /opt/collectd/etc/collectd.conf.d/:/opt/collectd/etc/collectd.conf.d
+       - /var/run:/var/run
+       - /tmp:/tmp
+       - /var/lib/collectd:/var/lib/collectd
+    command: "/run_collectd.sh"
+    detach: yes
+    state: present
+    restart: no
+    privileged: yes
+    network_mode: host
diff --git a/ansible/roles/docker/tasks/Debian.yml b/ansible/roles/docker/tasks/Debian.yml
index 7f998de45..a03040d88 100644
--- a/ansible/roles/docker/tasks/Debian.yml
+++ b/ansible/roles/docker/tasks/Debian.yml
@@ -14,3 +14,19 @@
 ---
   - name: Install docker.io
     action: "{{ ansible_pkg_mgr }} name=docker.io state=present force=yes"
+
+  - name: Update package manager cache
+    tags:
+       - cache_update
+    package:
+       update_cache: yes
+
+  - name: Install python-pip
+    package:
+       name: python-pip
+       state: present
+
+  - name: Install docker-py
+    pip:
+       name: docker-py
+       state: present
diff --git a/ansible/roles/install_dpdk/tasks/main.yml b/ansible/roles/install_dpdk/tasks/main.yml
index f89a43cae..d1dc2900b 100644
--- a/ansible/roles/install_dpdk/tasks/main.yml
+++ b/ansible/roles/install_dpdk/tasks/main.yml
@@ -128,3 +128,18 @@
     remote_src: yes
     force: yes
     mode: 0755
+
+- name: make vPE binary
+  command: make -j {{ ansible_processor_vcpus }}
+  args:
+    chdir: "{{ dpdk_path }}/examples/ip_pipeline"
+  environment:
+    RTE_SDK: "{{ dpdk_path }}"
+
+- name: Copy vPE to correct location
+  copy:
+    src: "{{ dpdk_path }}/examples/ip_pipeline/build/app/ip_pipeline"
+    dest: "{{ INSTALL_BIN_PATH }}/vPE_vnf"
+    remote_src: yes
+    force: yes
+    mode: 0755
diff --git a/ansible/ubuntu_server_baremetal_deploy_samplevnfs.yml b/ansible/ubuntu_server_baremetal_deploy_samplevnfs.yml
index 3a29a8a90..b69fb58fb 100644
--- a/ansible/ubuntu_server_baremetal_deploy_samplevnfs.yml
+++ b/ansible/ubuntu_server_baremetal_deploy_samplevnfs.yml
@@ -54,3 +54,5 @@
     - install_pmu_tools
     - download_collectd
     - install_collectd
+    - docker
+    - barometer_collectd