From 81a9e673bbd0d0d3594b07d1b3d5b93c9fd4dd3d Mon Sep 17 00:00:00 2001
From: Yichen Wang <yicwang@cisco.com>
Date: Tue, 28 Jun 2016 12:08:43 -0700
Subject: [PATCH] Fix the DIB issue for building KB image

1. Fix the DIB issue for building KB image;
2. Remove the redundent package installations during image building;

Change-Id: Ia3d817e062bfa5567ea354596f7ab8bd811ded3c
---
 .../kloudbuster/package-installs.yaml         |  3 ---
 .../kloudbuster/post-install.d/01-kb-script   | 19 +++++++------------
 2 files changed, 7 insertions(+), 15 deletions(-)
 mode change 100644 => 100755 kb_dib/elements/kloudbuster/post-install.d/01-kb-script

diff --git a/kb_dib/elements/kloudbuster/package-installs.yaml b/kb_dib/elements/kloudbuster/package-installs.yaml
index d82fc9c..145f650 100644
--- a/kb_dib/elements/kloudbuster/package-installs.yaml
+++ b/kb_dib/elements/kloudbuster/package-installs.yaml
@@ -5,9 +5,6 @@ iperf:
 libssl-dev:
 libyaml-dev:
 nginx:
-nodejs:
-nodejs-legacy:
-npm:
 ntpdate:
 python-pip:
 python-dev:
diff --git a/kb_dib/elements/kloudbuster/post-install.d/01-kb-script b/kb_dib/elements/kloudbuster/post-install.d/01-kb-script
old mode 100644
new mode 100755
index 1f546a5..8a46703
--- a/kb_dib/elements/kloudbuster/post-install.d/01-kb-script
+++ b/kb_dib/elements/kloudbuster/post-install.d/01-kb-script
@@ -1,3 +1,5 @@
+#!/bin/sh
+
 # script for kloudbuster
 
 # Tune the Linux kernel for scale test
@@ -48,13 +50,11 @@ sed -i "s/127.0.0.1/0.0.0.0/g" /etc/redis/redis.conf
 # if started nginx should be allowed to open more file descriptors
 sed -i 's/start-stop-daemon\ --start/ulimit\ \-n\ 102400\n\t\0/g' /etc/init.d/nginx
 
-
 # Auto start the KloudBuster Agent, with user-data
 sed -i "s/^exit\s0/cd \/kb_test\n\0/g" /etc/rc.local
 sed -i "s/^exit\s0/if wget http\:\/\/169.254.169.254\/latest\/user-data; then \:; fi\n\0/g" /etc/rc.local
 sed -i "s/^exit\s0/python kb_vm_agent.py \&\n\0/g" /etc/rc.local
 
-
 # ======
 # Client
 # ======
@@ -80,14 +80,17 @@ mv /usr/local/lib/libhdr_histogram.so /usr/lib/
 
 # Install fio
 cd /tmp
-FIO='fio-2.8'
+FIO='fio-2.12'
 wget http://brick.kernel.dk/snaps/$FIO.tar.gz
 tar xzf $FIO.tar.gz
 cd $FIO
 make
 mv fio /usr/local/bin/fio
 
-
+# Install nuttcp
+cd /kb_test/kloudbuster/kb_dib/elements/nuttcp
+gcc nuttcp-7.3.3.c -o nuttcp
+mv nuttcp /usr/local/bin/nuttcp
 
 # =================
 # KloudBuster Proxy
@@ -97,16 +100,9 @@ git clone git://github.com/openstack/kloudbuster.git
 cd kloudbuster
 pip install -r requirements.txt
 
-
-# Install nuttcp
-cd /kb_test/kloudbuster/kb_dib/elements/nuttcp
-gcc nuttcp-7.3.3.c -o nuttcp
-mv nuttcp /usr/local/bin/nuttcp
-
 # =======
 # Cleanup
 # =======
-
 # Remove HdrHistogram_c, wrk2, and fio builds
 rm -rf /tmp/HdrHistogram_c
 rm -rf /tmp/wrk2
@@ -121,6 +117,5 @@ apt-get -y --purge remove python-pip
 apt-get -y --purge remove python-dev
 apt-get -y --purge remove build-essential
 apt-get -y --purge remove cmake
-apt-get -y --purge remove npm
 apt-get -y --purge autoremove
 apt-get -y autoclean