From 16f7eb21ac16ea0f1ba82516a8d4b75c4ede1519 Mon Sep 17 00:00:00 2001 From: Guo Ruijing Date: Thu, 22 Jun 2017 08:42:54 -0700 Subject: cleanup: remove fuel plugin since fuel@opnfv uses mcp Change-Id: Ibe2028b01c38fa545e72a00a7ef47103d1112b82 Signed-off-by: Guo Ruijing --- fuel-plugin-vsperf/LICENSE | 13 --------- fuel-plugin-vsperf/README.md | 9 ------ fuel-plugin-vsperf/deployment_scripts/deploy.sh | 11 -------- .../puppet/manifests/vsperf-install.pp | 13 --------- fuel-plugin-vsperf/deployment_tasks.yaml | 26 ----------------- fuel-plugin-vsperf/environment_config.yaml | 6 ---- fuel-plugin-vsperf/metadata.yaml | 32 --------------------- fuel-plugin-vsperf/node_roles.yaml | 15 ---------- fuel-plugin-vsperf/pre_build_hook | 33 ---------------------- fuel-plugin-vsperf/repositories/centos/.gitkeep | 0 fuel-plugin-vsperf/repositories/ubuntu/.gitkeep | 0 fuel-plugin-vsperf/tasks.yaml | 8 ------ fuel-plugin-vsperf/vagrant/README.md | 13 --------- fuel-plugin-vsperf/vagrant/Vagrantfile | 28 ------------------ fuel-plugin-vsperf/vagrant/build_fuel_plugin.sh | 14 --------- 15 files changed, 221 deletions(-) delete mode 100644 fuel-plugin-vsperf/LICENSE delete mode 100644 fuel-plugin-vsperf/README.md delete mode 100755 fuel-plugin-vsperf/deployment_scripts/deploy.sh delete mode 100644 fuel-plugin-vsperf/deployment_scripts/puppet/manifests/vsperf-install.pp delete mode 100644 fuel-plugin-vsperf/deployment_tasks.yaml delete mode 100644 fuel-plugin-vsperf/environment_config.yaml delete mode 100644 fuel-plugin-vsperf/metadata.yaml delete mode 100644 fuel-plugin-vsperf/node_roles.yaml delete mode 100755 fuel-plugin-vsperf/pre_build_hook delete mode 100644 fuel-plugin-vsperf/repositories/centos/.gitkeep delete mode 100644 fuel-plugin-vsperf/repositories/ubuntu/.gitkeep delete mode 100644 fuel-plugin-vsperf/tasks.yaml delete mode 100644 fuel-plugin-vsperf/vagrant/README.md delete mode 100644 fuel-plugin-vsperf/vagrant/Vagrantfile delete mode 100755 fuel-plugin-vsperf/vagrant/build_fuel_plugin.sh diff --git a/fuel-plugin-vsperf/LICENSE b/fuel-plugin-vsperf/LICENSE deleted file mode 100644 index da963557..00000000 --- a/fuel-plugin-vsperf/LICENSE +++ /dev/null @@ -1,13 +0,0 @@ -Copyright 2015-2016 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. diff --git a/fuel-plugin-vsperf/README.md b/fuel-plugin-vsperf/README.md deleted file mode 100644 index 5e7e9346..00000000 --- a/fuel-plugin-vsperf/README.md +++ /dev/null @@ -1,9 +0,0 @@ - - -fuel-plugin-vsperf -================== - -Install VSPERF tool as part of OVSNFV deployment. diff --git a/fuel-plugin-vsperf/deployment_scripts/deploy.sh b/fuel-plugin-vsperf/deployment_scripts/deploy.sh deleted file mode 100755 index 084d1e3e..00000000 --- a/fuel-plugin-vsperf/deployment_scripts/deploy.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2016-2017 Intel corporation. -# -# 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 - -# It's a script which deploys your plugin - diff --git a/fuel-plugin-vsperf/deployment_scripts/puppet/manifests/vsperf-install.pp b/fuel-plugin-vsperf/deployment_scripts/puppet/manifests/vsperf-install.pp deleted file mode 100644 index 43787c7b..00000000 --- a/fuel-plugin-vsperf/deployment_scripts/puppet/manifests/vsperf-install.pp +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (c) 2016-2017 Intel corporation. -# -# 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 - -$master_ip = hiera('master_ip') - -exec { "install vsperf": - command => "mkdir -p /opt/vswitchperf; curl http://$master_ip:8080/plugins/fuel-plugin-vsperf-1.0/repositories/ubuntu/vswitchperf.tgz | tar xzv -C /opt/vswitchperf", - path => "/usr/bin:/usr/sbin:/bin:/sbin"; -} diff --git a/fuel-plugin-vsperf/deployment_tasks.yaml b/fuel-plugin-vsperf/deployment_tasks.yaml deleted file mode 100644 index d37f1545..00000000 --- a/fuel-plugin-vsperf/deployment_tasks.yaml +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2016-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 - -- id: vsperf - type: group - role: [vsperf] - requires: [deploy_start] - required_for: [deploy_end] - tasks: [hiera, setup_repositories, fuel_pkgs, globals, tools, logging, vsperf_install] - parameters: - strategy: - type: parallel -- id: vsperf_install - type: puppet - version: 2.0.0 - groups: [vsperf] - required_for: [post_deployment_end] - requires: [post_deployment_start] - parameters: - puppet_manifest: puppet/manifests/vsperf-install.pp - puppet_modules: puppet/modules:/etc/puppet/modules - timeout: 720 diff --git a/fuel-plugin-vsperf/environment_config.yaml b/fuel-plugin-vsperf/environment_config.yaml deleted file mode 100644 index 5962e8cf..00000000 --- a/fuel-plugin-vsperf/environment_config.yaml +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2016-2017 Intel corporation. -# -# 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 diff --git a/fuel-plugin-vsperf/metadata.yaml b/fuel-plugin-vsperf/metadata.yaml deleted file mode 100644 index cf64e292..00000000 --- a/fuel-plugin-vsperf/metadata.yaml +++ /dev/null @@ -1,32 +0,0 @@ -# Plugin name -name: fuel-plugin-vsperf -# Human-readable name for your plugin -title: Enable VSPERF plugin -# Plugin version -version: '1.0.10' -# Description -description: Deploy VSPERF code -# Required fuel version -fuel_version: ['10.0'] -# Specify license of your plugin -licenses: ['Apache License Version 2.0'] -# Specify author or company name -authors: ['billy.o.mahony@intel.com'] -# A link to the plugin's page -homepage: 'https://github.com/stackforge/fuel-plugins' -# Specify a group which your plugin implements, possible options: -# network, storage, storage::cinder, storage::glance, hypervisor -groups: ['network'] - -# The plugin is compatible with releases in the list -releases: - - os: ubuntu - version: newton-10.0 - mode: ['ha'] - deployment_scripts_path: deployment_scripts/ - repository_path: repositories/ubuntu - -# Version of plugin package -package_version: '4.0.0' - -is_hotpluggable: true diff --git a/fuel-plugin-vsperf/node_roles.yaml b/fuel-plugin-vsperf/node_roles.yaml deleted file mode 100644 index c2370fc7..00000000 --- a/fuel-plugin-vsperf/node_roles.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2016-2017 Intel corporation. -# -# 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 - -vsperf: - name: "VSPERF" - description: "Install VSPERF on nodes with this role" - has_primary: false # whether has primary role or not - public_ip_required: false # whether requires public net or not - weight: 50 # weight that will be used for ordering on fuel ui - limits: - min: 0 diff --git a/fuel-plugin-vsperf/pre_build_hook b/fuel-plugin-vsperf/pre_build_hook deleted file mode 100755 index ea7bc206..00000000 --- a/fuel-plugin-vsperf/pre_build_hook +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2016-2017 Intel corporation. -# -# 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 - -# Add here any the actions which are required before plugin build -# like packages building, packages downloading from mirrors and so on. -# The script should return 0 if there were no errors. -#!/bin/bash - -set -eux - -BUILD_FOR=${BUILD_FOR:-ubuntu} -DIR="$(dirname `readlink -f $0`)" - -function build_pkg { - case $1 in - ubuntu) - cd ${DIR}/.. - tar cfvz ${DIR}/repositories/ubuntu/vswitchperf.tgz . --exclude=vswitchperf.tgz - ;; - *) echo "Not supported system"; exit 1;; - esac -} - -for system in $BUILD_FOR -do - build_pkg $system -done diff --git a/fuel-plugin-vsperf/repositories/centos/.gitkeep b/fuel-plugin-vsperf/repositories/centos/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/fuel-plugin-vsperf/repositories/ubuntu/.gitkeep b/fuel-plugin-vsperf/repositories/ubuntu/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/fuel-plugin-vsperf/tasks.yaml b/fuel-plugin-vsperf/tasks.yaml deleted file mode 100644 index c7f81214..00000000 --- a/fuel-plugin-vsperf/tasks.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2016-2017 Intel corporation. -# -# 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 - -[] diff --git a/fuel-plugin-vsperf/vagrant/README.md b/fuel-plugin-vsperf/vagrant/README.md deleted file mode 100644 index c979e783..00000000 --- a/fuel-plugin-vsperf/vagrant/README.md +++ /dev/null @@ -1,13 +0,0 @@ - - -Build fuel plugin -================== - -The plugin build support Ubuntu 14.04 - -1. sudo apt-get install vagrant virtualbox - -2. vagrant up diff --git a/fuel-plugin-vsperf/vagrant/Vagrantfile b/fuel-plugin-vsperf/vagrant/Vagrantfile deleted file mode 100644 index 78128e8b..00000000 --- a/fuel-plugin-vsperf/vagrant/Vagrantfile +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright (c) 2016-2017 Intel corporation. -# -# 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 - -# # -*- mode: ruby -*- -# vi: set ft=ruby : - -# Vagrantfile API/syntax version. Don't touch unless you know what you're doing! -VAGRANTFILE_API_VERSION = "2" - -Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - - config.vm.box = "trusty-server-cloudimg-amd64" - config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box" - - config.vm.define "fuel" do | h | - h.vm.host_name = "fuel" - h.vm.provision :shell, :inline => "/vagrant/build_fuel_plugin.sh" - h.vm.synced_folder "../..", "/vswitchperf" - h.vm.provider :virtualbox do |v| - v.customize ["modifyvm", :id, "--memory", 4096] - v.customize ["modifyvm", :id, "--cpus", 4] - end - end -end diff --git a/fuel-plugin-vsperf/vagrant/build_fuel_plugin.sh b/fuel-plugin-vsperf/vagrant/build_fuel_plugin.sh deleted file mode 100755 index cd3e6226..00000000 --- a/fuel-plugin-vsperf/vagrant/build_fuel_plugin.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2016-2017 Intel corporation. -# -# 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 - -sudo apt-get update -y -sudo apt-get install -y ruby-dev rubygems-integration python-pip rpm createrepo dpkg-dev -sudo gem install fpm -sudo pip install fuel-plugin-builder -fpb --debug --build /vswitchperf/fuel-plugin-vsperf -- cgit 1.2.3-korg