From 8236a981a5f4e0eda4c6c47b8d9f006df00e7b64 Mon Sep 17 00:00:00 2001 From: Logan V Date: Sat, 10 Dec 2016 12:19:15 -0600 Subject: [PATCH] Remove unnecessary package installs Xenial PIP installs do not need all of the extra packages laid down on the host for SNI support like Trusty did. Change-Id: Ia3fe82b78ef06d8b8d90eb5071bf0e284dba38b9 --- defaults/main.yml | 6 +++--- vars/redhat-7.yml | 4 ++++ vars/ubuntu-14.04.yml | 4 ++++ vars/ubuntu-16.04.yml | 10 ---------- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 41da3ee..1252df2 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -35,14 +35,14 @@ pip_source_install_options: "" # The URL/path of a constraints file to use when installing the additional pip packages. #pip_install_upper_constraints: "http://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt" +pip_install_distro_packages: [] + # This list var can be used to specify specific versions of pip, setuptools, # wheel and any other packages which must be installed when pip installs. pip_packages: - pip -pip_required_pip_packages: - - ndg-httpsclient # SSL SNI support - - requests # SSL SNI support +pip_required_pip_packages: [] ## APT Cache options cache_timeout: 600 diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml index 6664330..2416422 100644 --- a/vars/redhat-7.yml +++ b/vars/redhat-7.yml @@ -20,3 +20,7 @@ pip_install_distro_packages: - python-devel - python-pyasn1 - pyOpenSSL + +pip_required_pip_packages: + - ndg-httpsclient # SSL SNI support + - requests # SSL SNI support diff --git a/vars/ubuntu-14.04.yml b/vars/ubuntu-14.04.yml index c934af5..56eacad 100644 --- a/vars/ubuntu-14.04.yml +++ b/vars/ubuntu-14.04.yml @@ -21,3 +21,7 @@ pip_install_distro_packages: - python-dev - python-openssl - python-pyasn1 + +pip_required_pip_packages: + - ndg-httpsclient # SSL SNI support + - requests # SSL SNI support diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml index d2be424..314e6e9 100644 --- a/vars/ubuntu-16.04.yml +++ b/vars/ubuntu-16.04.yml @@ -12,13 +12,3 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - -pip_install_distro_packages: - - build-essential - - python-dev - - python-setuptools - - libffi-dev - - libssl-dev - - python-dev - - python-openssl - - python-pyasn1