diff options
author | Ross Brattain <ross.b.brattain@intel.com> | 2017-06-22 01:51:45 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-06-22 01:51:45 +0000 |
commit | bbd60b6bddcf363d76c1dff34d21158caa18c0a1 (patch) | |
tree | 960d6f20254a5aa4e4c79ae74829e7d1b7b54d99 /fuel-plugin/deployment_scripts | |
parent | 418b31051fb38881e3f18ad93d036878297e8ad7 (diff) | |
parent | a2ff61e74a7de5379dc2676d9e7b2b61bab809dc (diff) |
Merge "cleanup: remove fuel plugin since fuel@opnfv uses mcp"
Diffstat (limited to 'fuel-plugin/deployment_scripts')
-rwxr-xr-x | fuel-plugin/deployment_scripts/install.sh | 47 | ||||
-rw-r--r-- | fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp | 33 |
2 files changed, 0 insertions, 80 deletions
diff --git a/fuel-plugin/deployment_scripts/install.sh b/fuel-plugin/deployment_scripts/install.sh deleted file mode 100755 index 251d044bf..000000000 --- a/fuel-plugin/deployment_scripts/install.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash -# Copyright (c) 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 -# -# 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. - - -set -eux - -HOST=$1 -BIN_HOME=/opt/yardstick -VAR_HOME=/var/lib/yardstick -rm -rf $BIN_HOME; mkdir -p $BIN_HOME -rm -rf $VAR_HOME; mkdir -p $VAR_HOME - -apt-get install -y python-dev python-pip libffi-dev libssl-dev libxml2-dev libxslt1-dev - -#apt-get install python-virtualenv cannot work -#use pip to work around the issue - -pip install virtualenv - -# create python virtual env -virtualenv $VAR_HOME - -export PS1="yardstick" -source $VAR_HOME/bin/activate - -easy_install -U setuptools - -cd $BIN_HOME - -curl http://$HOST:8080/plugins/fuel-plugin-yardstick-1.0/repositories/ubuntu/yardstick.tar.gz | tar xzvf - - -# install dependency -pip install -r requirements.txt - -python setup.py install diff --git a/fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp b/fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp deleted file mode 100644 index 3741bacf2..000000000 --- a/fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp +++ /dev/null @@ -1,33 +0,0 @@ -$master_ip = hiera('master_ip') - -$access_hash = hiera_hash('access', {}) -$admin_tenant = $access_hash['tenant'] -$admin_user = $access_hash['user'] -$admin_password = $access_hash['password'] -$region = hiera('region', 'RegionOne') - -$auth_api_version = '' -$service_endpoint = hiera('service_endpoint', $management_vip) -$ssl_hash = hiera_hash('use_ssl', {}) -$internal_auth_protocol = get_ssl_property($ssl_hash, {}, 'keystone', 'internal', 'protocol', 'http') -$internal_auth_address = get_ssl_property($ssl_hash, {}, 'keystone', 'internal', 'hostname', [$service_endpoint]) -$identity_uri = "${internal_auth_protocol}://${internal_auth_address}:5000" -$auth_url = "${identity_uri}/${auth_api_version}" - -exec { "install yardstick": - command => "curl http://${master_ip}:8080/plugins/fuel-plugin-yardstick-1.0/deployment_scripts/install.sh | bash -s ${master_ip}", - path => "/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin"; -} - -osnailyfacter::credentials_file { '/var/lib/yardstick.openrc': - admin_user => $admin_user, - admin_password => $admin_password, - admin_tenant => $admin_tenant, - region_name => $region, - auth_url => $auth_url, -} - -exec { "run yardstick": - command => "echo hello", - path => "/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin"; -} |