Merge "libyajl: install from pkg"

9 files changed, 3 insertions, 110 deletions

diff --git a/ansible/install_collectd.yml b/ansible/install_collectd.yml
index 26d18799c..647547053 100644
--- a/ansible/install_collectd.yml
+++ b/ansible/install_collectd.yml
@@ -23,8 +23,6 @@
     - install_rabbitmq
     - download_intel_cmt_cat
     - install_intel_cmt_cat
-    - download_yajl
-    - install_yajl
     - download_collectd
     - install_collectd
 
diff --git a/ansible/roles/download_yajl/defaults/main.yml b/ansible/roles/download_yajl/defaults/main.yml
deleted file mode 100644
index 10e8c058a..000000000
--- a/ansible/roles/download_yajl/defaults/main.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-yajl_url: "https://github.com/yajl/yajl.git"
-yajl_dest: "{{ clone_dest }}/yajl"
-yajl_version: "master"
diff --git a/ansible/roles/download_yajl/tasks/main.yml b/ansible/roles/download_yajl/tasks/main.yml
deleted file mode 100644
index 0b115d06e..000000000
--- a/ansible/roles/download_yajl/tasks/main.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (c) 2017 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.
----
-#- debug:
-#    var: yajl_version
-#    verbosity: 2
-
-- name: fetch yajl
-  git:
-    repo: "{{ yajl_url }}"
-    dest: "{{ yajl_dest }}"
-    version: "{{ yajl_version }}"
-    accept_hostkey: yes
-    recursive: no
-    force: yes
-
-- set_fact:
-    yajl_path: "{{ yajl_dest }}"
diff --git a/ansible/roles/install_collectd/tasks/main.yml b/ansible/roles/install_collectd/tasks/main.yml
index 8368df103..53f49097f 100644
--- a/ansible/roles/install_collectd/tasks/main.yml
+++ b/ansible/roles/install_collectd/tasks/main.yml
@@ -22,7 +22,7 @@
     chdir: "{{ collectd_path }}"
 
 - name: build collectd
-  shell: "./configure --with-libpqos=/usr/ --with-libdpdk={{ dpdk_shared_path }} --with-libyajl=/usr/local --enable-debug --enable-dpdkstat --enable-virt --enable-ovs_stats --prefix={{ INSTALL_BIN_PATH }}/collectd |& tee collectd-configure.txt"
+  shell: "./configure --with-libpqos=/usr/ --with-libdpdk={{ dpdk_shared_path }} --with-libyajl=/usr/ --enable-debug --enable-dpdkstat --enable-virt --enable-ovs_stats --prefix={{ INSTALL_BIN_PATH }}/collectd |& tee collectd-configure.txt"
   args:
     executable: /bin/bash
     chdir: "{{ collectd_path }}"
diff --git a/ansible/roles/install_collectd/vars/main.yml b/ansible/roles/install_collectd/vars/main.yml
index 0cafc80dd..b1b3dc5db 100644
--- a/ansible/roles/install_collectd/vars/main.yml
+++ b/ansible/roles/install_collectd/vars/main.yml
@@ -25,6 +25,7 @@ collectd_build_dependencies:
     - rabbitmq-server
     - cmake
     - libvirt-dev
+    - libyajl-dev
   RedHat:
     - flex
     - bison
@@ -35,4 +36,5 @@ collectd_build_dependencies:
     - librabbitmq-devel
     - libtool-ltdl-devel
     - libvirt-devel
+    - yajl-devel
 
diff --git a/ansible/roles/install_yajl/tasks/main.yml b/ansible/roles/install_yajl/tasks/main.yml
deleted file mode 100644
index 20fd958c8..000000000
--- a/ansible/roles/install_yajl/tasks/main.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (c) 2017 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: Install extra build dependencies
-  action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
-  with_items: "{{ yajl_build_dependencies[ansible_os_family] }}"
-
-- name: configure
-  command: ./configure
-  args:
-    chdir: "{{ yajl_path }}"
-
-- name: "make yajl"
-  make:
-    chdir: "{{ yajl_path }}"
-
-- name: "make install yajl"
-  make:
-    chdir: "{{ yajl_path }}"
-    target: install
diff --git a/ansible/roles/install_yajl/vars/main.yml b/ansible/roles/install_yajl/vars/main.yml
deleted file mode 100644
index 1b192e87b..000000000
--- a/ansible/roles/install_yajl/vars/main.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright (c) 2017 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.
----
-yajl_build_dependencies:
-  Debian:
-    - flex
-    - bison
-    - build-essential
-    - pkg-config
-    - automake
-    - autotools-dev
-    - libltdl-dev
-    - librabbitmq-dev
-    - rabbitmq-server
-    - cmake
-    - libvirt-dev
-  RedHat:
-    - flex
-    - bison
-    - pkgconfig
-    - automake
-    - cmake
-    - rabbitmq-server
-    - librabbitmq-devel
-    - libtool-ltdl-devel
-    - libvirt-devel
-
diff --git a/ansible/ubuntu_server_baremetal_deploy_samplevnfs.yml b/ansible/ubuntu_server_baremetal_deploy_samplevnfs.yml
index cfebcc151..c55886693 100644
--- a/ansible/ubuntu_server_baremetal_deploy_samplevnfs.yml
+++ b/ansible/ubuntu_server_baremetal_deploy_samplevnfs.yml
@@ -47,7 +47,5 @@
     - install_rabbitmq
     - download_intel_cmt_cat
     - install_intel_cmt_cat
-    - download_yajl
-    - install_yajl
     - download_collectd
     - install_collectd
diff --git a/ansible/ubuntu_server_cloudimg_modify_samplevnfs.yml b/ansible/ubuntu_server_cloudimg_modify_samplevnfs.yml
index b060967ef..af4b91a4e 100644
--- a/ansible/ubuntu_server_cloudimg_modify_samplevnfs.yml
+++ b/ansible/ubuntu_server_cloudimg_modify_samplevnfs.yml
@@ -56,7 +56,5 @@
     - install_rabbitmq
     - download_intel_cmt_cat
     - install_intel_cmt_cat
-    - download_yajl
-    - install_yajl
     - download_collectd
     - install_collectd