summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-21 09:18:33 +0000
committerGerrit Code Review <review@openstack.org>2016-09-21 09:18:33 +0000
commitc248175b517cf67a3f4baf1ccf50bc69a00e7548 (patch)
tree5406866044d90d0cd1e169492f139f0707a5ba86
parent64958a41371d376d41e89f317cc3cc34b48a30e5 (diff)
parent01dabb2c76ece2b792471d787f0739aac36659cd (diff)
Merge "Revert "Requirements on cliff-tab is replaced with cliff requirement.""
-rw-r--r--Dockerfile2
-rw-r--r--Vagrantfile2
-rw-r--r--debian/control2
-rw-r--r--requirements.txt2
-rw-r--r--specs/network-checker.spec2
5 files changed, 5 insertions, 5 deletions
diff --git a/Dockerfile b/Dockerfile
index 4028995..7a2455e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ ENV ARCH amd64
3ENV DIST trusty 3ENV DIST trusty
4RUN echo 'deb http://fuel-repository.mirantis.com/fwm/5.0/ubuntu trusty main' >> /etc/apt/sources.list 4RUN echo 'deb http://fuel-repository.mirantis.com/fwm/5.0/ubuntu trusty main' >> /etc/apt/sources.list
5RUN apt-get -q update 5RUN apt-get -q update
6RUN apt-get -y --force-yes install cliff python-pyparsing python-pypcap scapy python-pip wget openssh-server 6RUN apt-get -y --force-yes install cliff-tablib python-pyparsing python-pypcap scapy python-pip wget openssh-server
7RUN pip install pytest mock 7RUN pip install pytest mock
8RUN sudo locale-gen en_US.UTF-8 8RUN sudo locale-gen en_US.UTF-8
9 9
diff --git a/Vagrantfile b/Vagrantfile
index 76afd28..4387334 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -17,7 +17,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
17 config.vm.network :private_network, ip: '10.200.0.0', type: 'dhcp' 17 config.vm.network :private_network, ip: '10.200.0.0', type: 'dhcp'
18 config.vm.provision :shell, :inline => "echo 'deb http://fuel-repository.mirantis.com/fwm/5.0/ubuntu trusty main' >> /etc/apt/sources.list" 18 config.vm.provision :shell, :inline => "echo 'deb http://fuel-repository.mirantis.com/fwm/5.0/ubuntu trusty main' >> /etc/apt/sources.list"
19 config.vm.provision :shell, :inline => "sudo apt-get update" 19 config.vm.provision :shell, :inline => "sudo apt-get update"
20 config.vm.provision :shell, :inline => "sudo apt-get -y --force-yes install cliff python-pyparsing python-pypcap scapy python-pip vde2" 20 config.vm.provision :shell, :inline => "sudo apt-get -y --force-yes install cliff-tablib python-pyparsing python-pypcap scapy python-pip vde2"
21 config.vm.provision :shell, :inline => "sudo pip install pytest mock" 21 config.vm.provision :shell, :inline => "sudo pip install pytest mock"
22 config.vm.provision :shell, :inline => "cd /vagrant && sudo python setup.py develop" 22 config.vm.provision :shell, :inline => "cd /vagrant && sudo python setup.py develop"
23 end 23 end
diff --git a/debian/control b/debian/control
index 7a144a9..3d21488 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Package: network-checker
12Replaces: nailgun-net-check 12Replaces: nailgun-net-check
13Conflicts: nailgun-net-check 13Conflicts: nailgun-net-check
14Architecture: all 14Architecture: all
15Depends: cliff, 15Depends: cliff-tablib,
16 python-daemonize, 16 python-daemonize,
17 python-netifaces, 17 python-netifaces,
18 python-pypcap, 18 python-pypcap,
diff --git a/requirements.txt b/requirements.txt
index e7283e1..94ce29a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
1cliff 1cliff-tablib
2scapy==2.2.0-dev 2scapy==2.2.0-dev
3pypcap==1.1.1 3pypcap==1.1.1
4stevedore 4stevedore
diff --git a/specs/network-checker.spec b/specs/network-checker.spec
index 9ab59b2..5d789e6 100644
--- a/specs/network-checker.spec
+++ b/specs/network-checker.spec
@@ -17,7 +17,7 @@ Requires: python-argparse
17Requires: vconfig 17Requires: vconfig
18%endif 18%endif
19Requires: python-pypcap 19Requires: python-pypcap
20Requires: python-cliff 20Requires: python-cliff-tablib
21Requires: python-stevedore 21Requires: python-stevedore
22Requires: python-daemonize 22Requires: python-daemonize
23Requires: python-yaml 23Requires: python-yaml