4 files changed, 5 insertions, 36 deletions
diff --git a/build/build_perf_image.sh b/build/build_perf_image.sh
index 50843e46..80e615ef 100644
--- a/build/build_perf_image.sh
+++ b/build/build_perf_image.sh
@@ -34,7 +34,7 @@ fi
 
 if [ "$CATEGORY" == "kernel" ]; then
   LIBGUESTFS_BACKEND=direct virt-customize \
-    --run-command "bash -x /root/setkernelparam.sh $KEY $VALUE" \
+    --run-command "grubby --update-kernel=ALL --args=$KEY=$VALUE" \
     -a $IMAGE
 fi
 
diff --git a/build/opnfv-apex-common.spec b/build/opnfv-apex-common.spec
index 464bae91..6067c7e0 100644
--- a/build/opnfv-apex-common.spec
+++ b/build/opnfv-apex-common.spec
@@ -35,6 +35,7 @@ install ci/util.sh %{buildroot}%{_bindir}/opnfv-util
 mkdir -p %{buildroot}%{_sysconfdir}/opnfv-apex/
 install config/deploy/os-nosdn-nofeature-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-noha.yaml
 install config/deploy/os-nosdn-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-ha.yaml
+install config/deploy/os-nosdn-performance-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-performance-ha.yaml
 install config/deploy/os-odl_l2-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-nofeature-ha.yaml
 install config/deploy/os-odl_l2-sfc-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-sfc-noha.yaml
 install config/deploy/os-odl_l3-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-ha.yaml
@@ -72,6 +73,7 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/
 %{_var}/opt/opnfv/lib/installer/onos/onos_gw_mac_update.sh
 %{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-noha.yaml
 %{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-ha.yaml
+%{_sysconfdir}/opnfv-apex/os-nosdn-performance-ha.yaml
 %{_sysconfdir}/opnfv-apex/os-odl_l2-nofeature-ha.yaml
 %{_sysconfdir}/opnfv-apex/os-odl_l2-sfc-noha.yaml
 %{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-ha.yaml
@@ -87,6 +89,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/
 %doc %{_docdir}/opnfv/inventory.yaml.example
 
 %changelog
+* Wed Jun 1 2016 Feng Pan <fpan@redhat.com> - 3.0-6
+- Add performance deployment file
 * Sun May 15 2016 Feng Pan <fpan@redhat.com> - 3.0-5
 - Fixes python3 dependency.
 * Sun May 8 2016 Feng Pan <fpan@redhat.com> - 3.0-4
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index d0ee3f01..065201f8 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -29,13 +29,5 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --run-command "echo 'nf_conntrack_proto_sctp' > /etc/modules-load.d/nf_conntrack_proto_sctp.conf" \
     -a overcloud-full_build.qcow2
 
-###################################
-#####  Add CPU pinning script #####
-###################################
-
-LIBGUESTFS_BACKEND=direct virt-customize \
-    --upload ../setkernelparam.sh:/root \
-    -a overcloud-full_build.qcow2
-
 mv -f overcloud-full_build.qcow2 overcloud-full.qcow2
 popd > /dev/null
diff --git a/build/setkernelparam.sh b/build/setkernelparam.sh
deleted file mode 100644
index b6986d6c..00000000
--- a/build/setkernelparam.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-##############################################################################
-# Copyright (c) 2016 Red Hat Inc.
-# Michael Chapman <michapma@redhat.com>
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-GRUBCONF='/boot/grub2/grub.conf'
-
-if [ "$1" == "" ]; then
-  echo "No kernel parameter name provided, not modifying grub.conf"
-  exit 1
-fi
-
-if [ "$2" == "" ]; then
-  echo "No kernel parameter value provided, not modifying grub.conf"
-  exit 1
-fi
-
-echo "Setting $1=$2 in $GRUBCONF"
-echo "GRUB_CMDLINE_LINUX=\"\$GRUB_CMDLINE_LINUX $1=$2\"" >> /etc/default/grub
-grub2-mkconfig > $GRUBCONF
-exit 0