diff options
| author |   liang gao <jean.gaoliang@huawei.com> | 2016-07-19 08:17:46 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-07-19 08:17:46 +0000 |
| commit | 1e6ca0bfaaeadff7ce8ac9b1693b03d122e58a79 (patch) | |
| tree | 107cdbd9219a105436b1bcf4067636fe5fb8798f | |
| parent | 1f17dacf4548d8a939b134ab573108d15432c162 (diff) | |
| parent | 7a180df8683f8694dfbbc7980ba356e337a84cab (diff) | |
Merge "Minor fixes in fuel plugin 1. update yardstick tasks 2. fix typo 3. update comments in pre_build_hook"
| -rwxr-xr-x | fuel-plugin/deployment_scripts/install.sh | 6 | ||||
| -rw-r--r-- | fuel-plugin/deployment_tasks.yaml | 2 | ||||
| -rw-r--r-- | fuel-plugin/fuel_ping.yaml | 2 | ||||
| -rwxr-xr-x | fuel-plugin/pre_build_hook | 4 |
4 files changed, 10 insertions, 4 deletions
diff --git a/fuel-plugin/deployment_scripts/install.sh b/fuel-plugin/deployment_scripts/install.sh index 84ef96c48..76ef433c2 100755 --- a/fuel-plugin/deployment_scripts/install.sh +++ b/fuel-plugin/deployment_scripts/install.sh @@ -8,7 +8,11 @@ VAR_HOME=/var/lib/yardstick rm -rf $BIN_HOME; mkdir -p $BIN_HOME rm -rf $VAR_HOME; mkdir -p $VAR_HOME -sudo apt-get install -y python-dev python-pip libffi-dev libssl-dev libxml2-dev libxslt1-dev +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 diff --git a/fuel-plugin/deployment_tasks.yaml b/fuel-plugin/deployment_tasks.yaml index 90fae7192..6d53198b7 100644 --- a/fuel-plugin/deployment_tasks.yaml +++ b/fuel-plugin/deployment_tasks.yaml @@ -3,7 +3,7 @@ role: [yardstick] requires: [deploy_start] required_for: [deploy_end] - tasks: [hiera, setup_repositories, fuel_pkgs, globals, tools, logging, netconfig, yardstick-install] + tasks: [hiera, setup_repositories, fuel_pkgs, globals, tools, logging, netconfig] parameters: strategy: type: parallel diff --git a/fuel-plugin/fuel_ping.yaml b/fuel-plugin/fuel_ping.yaml index e367e98d1..550dfbc42 100644 --- a/fuel-plugin/fuel_ping.yaml +++ b/fuel-plugin/fuel_ping.yaml @@ -40,4 +40,4 @@ context: networks: test: - cidr: '192.169.111.0/24' + cidr: '192.168.111.0/24' diff --git a/fuel-plugin/pre_build_hook b/fuel-plugin/pre_build_hook index 9446d2a1a..9c0a40e65 100755 --- a/fuel-plugin/pre_build_hook +++ b/fuel-plugin/pre_build_hook @@ -10,7 +10,9 @@ function build_pkg { ubuntu) rm -rf ${DIR}/repositories/ubuntu; mkdir -p ${DIR}/repositories/ubuntu - # don't support online installation now + # fixme: don't support offline installation now since pip in + # deployment_scripts/install.sh needs to access to internet + # # cd ${DIR}/repositories/ubuntu # Use aptititude; apt-get -d will skip download if package is already installed # sudo apt-get install aptitude -y |