Merge "Make pyroute2 a requirement of octavia"

diskimage-create/diskimage-create.sh

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

elements/pyroute2/README.rst

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

elements/pyroute2/install.d/10-pyroute2

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

requirements.txt

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

test-requirements.txt

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