From 9a2b4855c8b3543c31fa62862fe55d54ce7123ce Mon Sep 17 00:00:00 2001 From: JingLu5 Date: Fri, 29 Jul 2016 11:13:46 +0800 Subject: Bugfix: move plugin install/remove scripts to "scripts" directory Change-Id: I0deb04c2e7e0908e8d28ace7ee8fdf27eec65917 Signed-off-by: JingLu5 --- yardstick/resources/script/install/storperf.bash | 27 ----------------------- yardstick/resources/script/remove/storperf.bash | 20 ----------------- yardstick/resources/scripts/install/storperf.bash | 27 +++++++++++++++++++++++ yardstick/resources/scripts/remove/storperf.bash | 20 +++++++++++++++++ 4 files changed, 47 insertions(+), 47 deletions(-) delete mode 100644 yardstick/resources/script/install/storperf.bash delete mode 100644 yardstick/resources/script/remove/storperf.bash create mode 100644 yardstick/resources/scripts/install/storperf.bash create mode 100644 yardstick/resources/scripts/remove/storperf.bash diff --git a/yardstick/resources/script/install/storperf.bash b/yardstick/resources/script/install/storperf.bash deleted file mode 100644 index 9bbec7206..000000000 --- a/yardstick/resources/script/install/storperf.bash +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -############################################################################## -# Copyright (c) 2016 Huawei Technologies Co.,Ltd and others. -# -# 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 -############################################################################## - -# StorPerf plugin installation script -# After installation, it will run StorPerf container on Jump Host -# Requirements: -# 1. docker has been installed on the Jump Host -# 2. Openstack environment file for storperf, '~/storperf_admin-rc', is ready. - -set -e - -mkdir -p /tmp/storperf-yardstick - -docker pull opnfv/storperf -docker run -t \ ---env-file ~/storperf_admin-rc \ --p 5000:5000 -p 8000:8000 \ --v /tmp/storperf-yardstick/carbon:/opt/graphite/storage/whisper \ ---name storperf-yardstick opnfv/storperf & diff --git a/yardstick/resources/script/remove/storperf.bash b/yardstick/resources/script/remove/storperf.bash deleted file mode 100644 index a8eb51c89..000000000 --- a/yardstick/resources/script/remove/storperf.bash +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -############################################################################## -# Copyright (c) 2016 Huawei Technologies Co.,Ltd and others. -# -# 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 -############################################################################## - -# StorPerf plugin un-installation script - -set -e - -docker stop storperf-yardstick -docker rm -f storperf-yardstick -docker rmi opnfv/storperf - -rm -rf /tmp/storperf-yardstick diff --git a/yardstick/resources/scripts/install/storperf.bash b/yardstick/resources/scripts/install/storperf.bash new file mode 100644 index 000000000..9bbec7206 --- /dev/null +++ b/yardstick/resources/scripts/install/storperf.bash @@ -0,0 +1,27 @@ +#!/bin/bash + +############################################################################## +# Copyright (c) 2016 Huawei Technologies Co.,Ltd and others. +# +# 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 +############################################################################## + +# StorPerf plugin installation script +# After installation, it will run StorPerf container on Jump Host +# Requirements: +# 1. docker has been installed on the Jump Host +# 2. Openstack environment file for storperf, '~/storperf_admin-rc', is ready. + +set -e + +mkdir -p /tmp/storperf-yardstick + +docker pull opnfv/storperf +docker run -t \ +--env-file ~/storperf_admin-rc \ +-p 5000:5000 -p 8000:8000 \ +-v /tmp/storperf-yardstick/carbon:/opt/graphite/storage/whisper \ +--name storperf-yardstick opnfv/storperf & diff --git a/yardstick/resources/scripts/remove/storperf.bash b/yardstick/resources/scripts/remove/storperf.bash new file mode 100644 index 000000000..a8eb51c89 --- /dev/null +++ b/yardstick/resources/scripts/remove/storperf.bash @@ -0,0 +1,20 @@ +#!/bin/bash + +############################################################################## +# Copyright (c) 2016 Huawei Technologies Co.,Ltd and others. +# +# 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 +############################################################################## + +# StorPerf plugin un-installation script + +set -e + +docker stop storperf-yardstick +docker rm -f storperf-yardstick +docker rmi opnfv/storperf + +rm -rf /tmp/storperf-yardstick -- cgit 1.2.3-korg