aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docker/openstack-base/Dockerfile.j22
-rw-r--r--requirements.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index 7aef11fc1..0016b27b9 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -296,6 +296,7 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
'cachetools',
'cliff',
'cmd2',
+ 'cryptography',
'contextlib2',
'debtcollector',
'decorator',
@@ -343,7 +344,6 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
'positional',
'prettytable',
'pycadf',
- 'pycrypto',
'pyinotify',
'pymysql',
'pyparsing',
diff --git a/requirements.txt b/requirements.txt
index 3ee8355b1..0b26a1a17 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,6 +3,7 @@
# process, which may cause wedges in the gate later.
pbr!=2.1.0,>=2.0.0 # Apache-2.0
docker>=2.0.0 # Apache-2.0
+cryptography>=1.6 # BSD/Apache-2.0
Jinja2!=2.9.0,!=2.9.1,!=2.9.2,!=2.9.3,!=2.9.4,>=2.8 # BSD License (3 clause)
gitdb>=0.6.4 # BSD License (3 clause)
GitPython>=1.0.1 # BSD License (3 clause)
@@ -10,5 +11,4 @@ six>=1.9.0 # MIT
oslo.config!=4.3.0,!=4.4.0,>=4.0.0 # Apache-2.0
oslo.utils>=3.20.0 # Apache-2.0
setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,>=16.0 # PSF/ZPL
-pycrypto>=2.6 # Public Domain
netaddr!=0.7.16,>=0.7.13 # BSD