Look for diskimage-builder not dib-utils when building amps

Also ignore E402 and W503 pep8 issues

Change-Id: I7937d0a21c7a748cd682511bd429de8cf0ffe498
This commit is contained in:
Adam Harwell 2017-03-09 01:18:06 +09:00
parent 1fbfd3c065
commit cf9a8c8f77
6 changed files with 7 additions and 41 deletions

View File

@ -10,8 +10,6 @@ function octavia_install {
if [ $OCTAVIA_NODE == 'main' ] || [ $OCTAVIA_NODE == 'standalone' ] ; then
if ! [ "$DISABLE_AMP_IMAGE_BUILD" == 'True' ]; then
install_package qemu kpartx
git_clone $DISKIMAGE_BUILDER_REPO $DISKIMAGE_BUILDER_DIR $DISKIMAGE_BUILDER_BRANCH
sudo -H -E pip install -r $DEST/diskimage-builder/requirements.txt
fi
fi
}

View File

@ -14,29 +14,15 @@ Prerequisites
This script assumes a typical Linux environment and was developed on
Ubuntu 12.04.5 LTS.
Python pip should be installed as well as the following python modules:
| argparse
| Babel>=1.3
| dib-utils
| PyYAML
Python pip should be installed as well as the python modules found in the
requirements.txt file.
Your cache directory should have at least 1GB available, the working directory
will need ~1.5GB, and your image destination will need ~500MB
The script expects to find the diskimage-builder git repository one
directory above the Octavia git repository.
The script will use the version of diskimage-builder installed on your system,
or it can be overridden by setting the following environment variables:
| /<some directory>/octavia
| /<some directory>/diskimage-builder
| cd /<some directory>
| git clone https://github.com/openstack/octavia.git
| git clone https://git.openstack.org/openstack/diskimage-builder.git
These paths can be overridden with the following environment variables:
| OCTAVIA_REPO_PATH = /<some directory>/octavia
| DIB_REPO_PATH = /<some directory>/diskimage-builder
| DIB_ELEMENTS = /<some directory>/diskimage-builder/elements

View File

@ -296,25 +296,6 @@ else
fi
fi
# pip may not be installed from package managers
# only check that we find an executable
if ! which pip &> /dev/null; then
echo "Required executable pip not found. Exiting."
exit 1
fi
# "pip freeze" does not show argparse, even if it is explicitly installed,
# because it is part of the standard python library in 2.7.
# See https://github.com/pypa/pip/issues/1570
PKG_LIST="Babel dib-utils PyYAML"
for pkg in $PKG_LIST; do
if ! pip freeze 2>/dev/null| grep -q "^$pkg==" &>/dev/null; then
echo "Required python package " $pkg " is not installed. Exiting."
exit 1
fi
done
if [ "$AMP_WORKING_DIR" ]; then
mkdir -p $AMP_WORKING_DIR
TEMP=$(mktemp -d $AMP_WORKING_DIR/diskimage-create.XXXXXX)

View File

@ -1,4 +1,4 @@
Babel>=1.3
dib-utils
diskimage-builder
PyYAML
six>=1.9.0

View File

@ -36,6 +36,7 @@ pyOpenSSL>=0.14 # Apache-2.0
WSME>=0.8 # MIT
Jinja2!=2.9.0,!=2.9.1,!=2.9.2,!=2.9.3,!=2.9.4,>=2.8 # BSD License (3 clause)
taskflow>=2.7.0 # Apache-2.0
diskimage-builder>=1.1.2,!=1.6.0,!=1.7.0,!=1.7.1 # Apache-2.0
#for the amphora api
Flask!=0.11,<1.0,>=0.10 # BSD

View File

@ -100,7 +100,7 @@ commands = bandit -r octavia -ll -ii -x octavia/tests {posargs}
[flake8]
# Ignoring O321 because it's unnecessarily restricting use of json package.
# jsonutils version doesn't add additional value
ignore = O321
ignore = O321,E402,W503
show-source = true
builtins = _
exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build