From 4e556954912fa959a21578bcfb07e460b6339a9a Mon Sep 17 00:00:00 2001 From: Eyal Date: Sun, 19 Apr 2020 14:10:38 +0300 Subject: [PATCH] Use setuptools extra to install openstack stuff Vitrage can work also in a non openstack environment Don't install openstack stuff unless needed Change-Id: I635d8597c103dd19ae1afd5c7d672bec4f5ff83f --- devstack/plugin.sh | 2 +- lower-constraints.txt | 1 + requirements.txt | 14 +------------- setup.cfg | 18 ++++++++++++++++++ 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 221d4d29a..a5c2b8430 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -267,7 +267,7 @@ function init_vitrage { # Install Vitrage. function install_vitrage { install_vitrageclient - setup_develop "$VITRAGE_DIR" + setup_develop "$VITRAGE_DIR" openstack sudo install -d -o $STACK_USER -m 755 $VITRAGE_CONF_DIR if [[ "$VITRAGE_DEPLOY" == "mod_wsgi" ]]; then diff --git a/lower-constraints.txt b/lower-constraints.txt index 4a8a556be..00e8d54d6 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -12,6 +12,7 @@ cmd2==0.8.1 contextlib2==0.5.5 cotyledon==1.6.8 coverage==4.5.1 +cryptography==2.1 debtcollector==1.19.0 deprecation==2.0 dogpile.cache==0.6.5 diff --git a/requirements.txt b/requirements.txt index 3a15c8104..1a6e2e26a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,22 +6,10 @@ pbr>=3.1.1 # Apache-2.0 alembic>=0.9.8 # MIT Babel>=2.5.3 # BSD cachetools>=2.0.1 # MIT License +cryptography>=2.1 # BSD/Apache-2.0 lxml>=4.1.1 # BSD PyMySQL>=0.8.0 # MIT License -aodhclient>=1.0.0 # Apache-2.0 -python-ceilometerclient>=2.9.0 # Apache-2.0 python-dateutil>=2.7.0 # BSD -python-keystoneclient>=3.15.0 # Apache-2.0 -python-neutronclient>=6.7.0 # Apache-2.0 -python-novaclient>=10.1.0 # Apache-2.0 -python-heatclient>=1.14.0 # Apache-2.0 -python-mistralclient>=3.3.0 # Apache-2.0 -python-openstackclient>=3.12.0 # Apache-2.0 -python-monascaclient>=1.7.1 # Apache-2.0 -python-troveclient>=2.2.0 # Apache-2.0 -python-zaqarclient >=1.2.0 -gnocchiclient>=3.3.1 # Apache-2.0 -pyzabbix>=0.7.4 # LGPL networkx>=2.3 # BSD oslo.config>=5.2.0 # Apache-2.0 oslo.context>=2.20.0 # Apache-2.0 diff --git a/setup.cfg b/setup.cfg index 90542b5a7..54350d445 100644 --- a/setup.cfg +++ b/setup.cfg @@ -21,6 +21,24 @@ classifier = Programming Language :: Python :: 3.7 Topic :: System :: Monitoring +[extras] +openstack = + aodhclient>=1.0.0 + python-ceilometerclient>=2.9.0 + python-keystoneclient>=3.15.0 + python-neutronclient>=6.7.0 + python-novaclient>=10.1.0 + python-heatclient>=1.14.0 + python-mistralclient>=3.3.0 + python-openstackclient>=3.12.0 + python-monascaclient>=1.7.1 + python-troveclient>=2.2.0 + python-zaqarclient >=1.2.0 + gnocchiclient>=3.3.1 + +zabbix = + pyzabbix>=0.7.4 # LGPL + [entry_points] console_scripts = vitrage-api = vitrage.cli.api:main