diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/requirements.pip | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index a51e3046e..e8cef3c0c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -122,9 +122,13 @@ ADD http://205.177.226.237:9999/onosfw/firewall_block_image.img /home/opnfv/func RUN gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 RUN curl -L https://get.rvm.io | bash -s stable +# SNAPS integration +RUN git clone --depth 1 https://gerrit.cablelabs.com/snaps-provisioning ${repos_dir}/snaps +RUN pip install -e ${repos_dir}/snaps/ + RUN /bin/bash -c ". /home/opnfv/repos/functest/functest/opnfv_tests/features/sfc/tacker_client_install.sh" RUN cd ${repos_dir}/bgpvpn && pip install . -RUN cd ${repos_dir}/kingbird && pip install -e . +#RUN cd ${repos_dir}/kingbird && pip install -e . RUN cd ${repos_dir}/moon/moonclient/ && python setup.py install RUN /bin/bash -c ". /etc/profile.d/rvm.sh \ diff --git a/docker/requirements.pip b/docker/requirements.pip index c3f77997c..ed941bc19 100644 --- a/docker/requirements.pip +++ b/docker/requirements.pip @@ -10,9 +10,10 @@ pyyaml==3.10 gitpython==1.0.1 python-openstackclient==2.3.0 -python-ceilometerclient==1.5.1 -python-keystoneclient==3.6.0 -python-neutronclient==4.1.1 +python-ceilometerclient==2.6.2 +python-keystoneclient==3.5.0 +python-neutronclient==6.0.0 +python-congressclient==1.5.0 virtualenv==1.11.4 pexpect==4.0 requests==2.8.0 @@ -24,7 +25,6 @@ Flask==0.10.1 xmltodict==0.9.2 scp==0.10.2 paramiko==1.16.0 -python-congressclient==1.3.0 subprocess32 shyaml dnspython |