Merge "Remove dependency on python-kubernetes"
This commit is contained in:
commit
226adbc2dc
|
@ -12,9 +12,6 @@ if is_service_enabled m-api m-cond; then
|
||||||
if [[ "$1" == "stack" && "$2" == "pre-install" ]]; then
|
if [[ "$1" == "stack" && "$2" == "pre-install" ]]; then
|
||||||
echo_summary "Before Installing magnum"
|
echo_summary "Before Installing magnum"
|
||||||
mkdir -p $SCREEN_LOGDIR
|
mkdir -p $SCREEN_LOGDIR
|
||||||
if [[ -z `grep 'python-kubernetes' ${REQUIREMENTS_DIR}/global-requirements.txt` ]]; then
|
|
||||||
echo "python-kubernetes>=0.2" >> ${REQUIREMENTS_DIR}/global-requirements.txt
|
|
||||||
fi
|
|
||||||
if [[ -z `grep 'docker-py' ${REQUIREMENTS_DIR}/global-requirements.txt` ]]; then
|
if [[ -z `grep 'docker-py' ${REQUIREMENTS_DIR}/global-requirements.txt` ]]; then
|
||||||
sed -i 's/requests>=.*/requests>=2.5.2/g' ${REQUIREMENTS_DIR}/global-requirements.txt
|
sed -i 's/requests>=.*/requests>=2.5.2/g' ${REQUIREMENTS_DIR}/global-requirements.txt
|
||||||
echo "docker-py>=1.1.0" >> ${REQUIREMENTS_DIR}/global-requirements.txt
|
echo "docker-py>=1.1.0" >> ${REQUIREMENTS_DIR}/global-requirements.txt
|
||||||
|
|
|
@ -21,7 +21,6 @@ oslo.i18n>=1.5.0,<1.6.0 # Apache-2.0
|
||||||
python-heatclient>=0.3.0
|
python-heatclient>=0.3.0
|
||||||
python-keystoneclient>=1.1.0
|
python-keystoneclient>=1.1.0
|
||||||
python-glanceclient>=0.15.0
|
python-glanceclient>=0.15.0
|
||||||
python-kubernetes>=0.2
|
|
||||||
six>=1.9.0
|
six>=1.9.0
|
||||||
SQLAlchemy>=0.9.7,<=0.9.99
|
SQLAlchemy>=0.9.7,<=0.9.99
|
||||||
taskflow>=0.7.1,<0.8.0
|
taskflow>=0.7.1,<0.8.0
|
||||||
|
|
Loading…
Reference in New Issue