openstack/octavia
Code Issues Proposed changes

Make pyroute2 a requirement of octavia

Browse Source 
We currently install this via its own element, but this could be made
more simple / obvious by using the python requirements tooling.

Change-Id: I2a2eed2b8ee481189c1694659ac8100062a25cf2
This commit is contained in:
Gregory Haynes 2016-08-22 17:46:29 +00:00
parent 628273aaf3
commit 579e24b727
5 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diskimage-create/diskimage-create.sh
View File

@ -347,12 +347,10 @@ if [ "$AMP_BASEOS" = "ubuntu" ]; then
AMP_element_sequence="$AMP_element_sequence rebind-sshd" AMP_element_sequence="$AMP_element_sequence rebind-sshd"
AMP_element_sequence="$AMP_element_sequence no-resolvconf" AMP_element_sequence="$AMP_element_sequence no-resolvconf"
AMP_element_sequence="$AMP_element_sequence amphora-agent-ubuntu" AMP_element_sequence="$AMP_element_sequence amphora-agent-ubuntu"
AMP_element_sequence="$AMP_element_sequence pyroute2"
AMP_element_sequence="$AMP_element_sequence keepalived-octavia-ubuntu" AMP_element_sequence="$AMP_element_sequence keepalived-octavia-ubuntu"
else else
AMP_element_sequence="$AMP_element_sequence no-resolvconf" AMP_element_sequence="$AMP_element_sequence no-resolvconf"
AMP_element_sequence="$AMP_element_sequence amphora-agent" AMP_element_sequence="$AMP_element_sequence amphora-agent"
AMP_element_sequence="$AMP_element_sequence pyroute2"
AMP_element_sequence="$AMP_element_sequence keepalived-octavia" AMP_element_sequence="$AMP_element_sequence keepalived-octavia"
fi fi

3
elements/pyroute2/README.rst
View File

@ -1,3 +0,0 @@
This element installs the pyroute2 python library.
Pyroute2 is a pure Python netlink and Linux network configuration library.

5
elements/pyroute2/install.d/10-pyroute2
View File

@ -1,5 +0,0 @@
#!/bin/bash
set -eux
pip install -U 'pyroute2>=0.3.10'

1
requirements.txt
View File

@ -39,3 +39,4 @@ Flask!=0.11,<1.0,>=0.10 # BSD
netifaces>=0.10.4 # MIT netifaces>=0.10.4 # MIT
ipaddress>=1.0.7;python_version<'3.3' # PSF ipaddress>=1.0.7;python_version<'3.3' # PSF
cryptography!=1.3.0,>=1.0 # BSD/Apache-2.0 cryptography!=1.3.0,>=1.0 # BSD/Apache-2.0
pyroute2>=0.4.3 # Apache-2.0 (+ dual licensed GPL2)

1
test-requirements.txt
View File

@ -5,7 +5,6 @@ hacking<0.10,>=0.9.1
requests-mock>=1.0 # Apache-2.0 requests-mock>=1.0 # Apache-2.0
coverage>=3.6 # Apache-2.0 coverage>=3.6 # Apache-2.0
mock>=2.0 # BSD mock>=2.0 # BSD
pyroute2>=0.4.3 # Apache-2.0 (+ dual licensed GPL2)
python-subunit>=0.0.18 # Apache-2.0/BSD python-subunit>=0.0.18 # Apache-2.0/BSD
oslotest>=1.10.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0
testrepository>=0.0.18 # Apache-2.0/BSD testrepository>=0.0.18 # Apache-2.0/BSD