summaryrefslogtreecommitdiffstats
path: root/repo
diff options
context:
space:
mode:
authorliyuenan <liyuenan@huawei.com>2017-02-06 10:05:49 +0800
committerJustin chi <chigang@huawei.com>2017-02-10 01:06:06 +0000
commit0aa766999cafc84e5414448219ade9ae4e520c18 (patch)
tree45f67e57c03d288cd4d65eb87604fde2260250c8 /repo
parent08fc4477bff0219d0277a63a9ab82a03087f7ef5 (diff)
Update shade version to avoid the conflict
JIRA: COMPASS-520 Shade and python-openstackclient both depends on python client libraries for OpenStack.If install one from pip and one from yum or apt, then there can be weird conflicts between the two sets of libraries. Update shade packages to resolve this problem. Change-Id: Icfd82d2818abfcf5061133fa6670b23daac9fb5b Signed-off-by: liyuenan <liyuenan@huawei.com>
Diffstat (limited to 'repo')
-rw-r--r--repo/pip/code_url.conf2
-rw-r--r--repo/pip/extra-requirement-wheel.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/repo/pip/code_url.conf b/repo/pip/code_url.conf
index 062e0bff..faf360e2 100644
--- a/repo/pip/code_url.conf
+++ b/repo/pip/code_url.conf
@@ -2,7 +2,7 @@
export BRANCH=${BRANCH:-stable/newton}
export GIT_URL="https://github.com/openstack/keystone.git \
- https://github.com/openstack/python-keystoneclient.git \
+ https://github.com/openstack/python-openstackclient.git \
https://github.com/openstack/nova.git \
https://github.com/openstack/python-novaclient.git \
https://github.com/openstack/neutron.git \
diff --git a/repo/pip/extra-requirement-wheel.txt b/repo/pip/extra-requirement-wheel.txt
index 50a64fc3..25daa1a0 100644
--- a/repo/pip/extra-requirement-wheel.txt
+++ b/repo/pip/extra-requirement-wheel.txt
@@ -9,4 +9,4 @@ yang2tosca==0.13
python-keyczar==0.715
crudini==0.7
pexpect==3.3
-shade==1.14.1
+shade==1.15.0