From b4c22392a4cd59e8218c3b071594423cb7efbda2 Mon Sep 17 00:00:00 2001 From: tierno Date: Wed, 14 Jun 2017 12:55:38 +0200 Subject: [PATCH] added python- openstackclient package at installation useful for debug Change-Id: I6443eeefe8beb961e20d465db99d6c2a78ed3a43 Signed-off-by: tierno --- Dockerfile | 2 +- requirements.txt | 1 + scripts/install-openmano.sh | 7 +++++-- setup.py | 1 + stdeb.cfg | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 84144a8c..82c3ca98 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,5 +6,5 @@ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get -y install python-pip libmysqlclient-dev libssl-dev libffi-dev && \ DEBIAN_FRONTEND=noninteractive pip install --upgrade pip && \ DEBIAN_FRONTEND=noninteractive pip install --upgrade setuptools && \ - DEBIAN_FRONTEND=noninteractive apt-get -y install python-argcomplete python-boto python-bottle python-jsonschema python-logutils python-cinderclient python-glanceclient python-keystoneclient python-neutronclient python-novaclient python-mysqldb + DEBIAN_FRONTEND=noninteractive apt-get -y install python-argcomplete python-boto python-bottle python-jsonschema python-logutils python-cinderclient python-glanceclient python-keystoneclient python-neutronclient python-novaclient python-openstackclient python-mysqldb diff --git a/requirements.txt b/requirements.txt index eb924781..0d6c4324 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,6 +6,7 @@ paramiko argcomplete requests logutils +python-openstackclient python-novaclient python-keystoneclient python-glanceclient diff --git a/scripts/install-openmano.sh b/scripts/install-openmano.sh index 0323cb4b..624dce35 100755 --- a/scripts/install-openmano.sh +++ b/scripts/install-openmano.sh @@ -249,8 +249,11 @@ then [ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && install_packages "python-boto" #TODO check if at Centos it exists with this name, or PIP should be used # install openstack client needed for using openstack as a VIM - [ "$_DISTRO" == "Ubuntu" ] && install_packages "python-novaclient python-keystoneclient python-glanceclient python-neutronclient python-cinderclient" - [ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && install_packages "python-devel" && easy_install python-novaclient python-keystoneclient python-glanceclient python-neutronclient python-cinderclient #TODO revise if gcc python-pip is needed + [ "$_DISTRO" == "Ubuntu" ] && install_packages "python-novaclient python-keystoneclient python-glanceclient "\ + "python-neutronclient python-cinderclient python-openstackclient" + [ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && install_packages "python-devel" && easy_install \ + python-novaclient python-keystoneclient python-glanceclient python-neutronclient python-cinderclient \ + python-openstackclient #TODO revise if gcc python-pip is needed fi # [[ -z "$NO_PACKAGES" ]] if [[ -z $NOCLONE ]]; then diff --git a/setup.py b/setup.py index 5f1382d9..303a6520 100755 --- a/setup.py +++ b/setup.py @@ -24,6 +24,7 @@ _requirements = [ "argcomplete", "requests", "logutils", + "python-openstackclient", "python-novaclient", "python-keystoneclient", "python-glanceclient", diff --git a/stdeb.cfg b/stdeb.cfg index 7fc8a8e3..a0c20ec7 100644 --- a/stdeb.cfg +++ b/stdeb.cfg @@ -2,5 +2,5 @@ Suite: xenial XS-Python-Version: >= 2.7 Maintainer: Gerardo Garcia -Depends: python-pip, libmysqlclient-dev, libssl-dev, libffi-dev, python-argcomplete, python-boto, python-bottle, python-jsonschema, python-logutils, python-cinderclient, python-glanceclient, python-keystoneclient, python-neutronclient, python-novaclient, python-mysqldb +Depends: python-pip, libmysqlclient-dev, libssl-dev, libffi-dev, python-argcomplete, python-boto, python-bottle, python-jsonschema, python-logutils, python-cinderclient, python-glanceclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient, python-mysqldb -- 2.25.1