Merge "Move barbican client in main tree"
This commit is contained in:
commit
bc084a1b44
|
@ -1 +0,0 @@
|
||||||
python-barbicanclient>=2.0.0
|
|
|
@ -25,10 +25,6 @@ packages =
|
||||||
data_files =
|
data_files =
|
||||||
lib/heat/barbican = heat_barbican/resources/*
|
lib/heat/barbican = heat_barbican/resources/*
|
||||||
|
|
||||||
[entry_points]
|
|
||||||
heat.clients =
|
|
||||||
barbican = heat_barbican.client:BarbicanClientPlugin
|
|
||||||
|
|
||||||
[global]
|
[global]
|
||||||
setup-hooks =
|
setup-hooks =
|
||||||
pbr.hooks.setup_hook
|
pbr.hooks.setup_hook
|
||||||
|
|
|
@ -14,10 +14,7 @@
|
||||||
from heat.engine.clients import client_plugin
|
from heat.engine.clients import client_plugin
|
||||||
|
|
||||||
|
|
||||||
try:
|
from barbicanclient import client as barbican_client
|
||||||
from barbicanclient import client as barbican_client
|
|
||||||
except ImportError:
|
|
||||||
barbican_client = None
|
|
||||||
|
|
||||||
|
|
||||||
class BarbicanClientPlugin(client_plugin.ClientPlugin):
|
class BarbicanClientPlugin(client_plugin.ClientPlugin):
|
|
@ -27,6 +27,7 @@ oslo.versionedobjects>=0.1.1
|
||||||
PasteDeploy>=1.5.0
|
PasteDeploy>=1.5.0
|
||||||
posix_ipc
|
posix_ipc
|
||||||
pycrypto>=2.6
|
pycrypto>=2.6
|
||||||
|
python-barbicanclient>=3.0.1
|
||||||
python-ceilometerclient>=1.0.13
|
python-ceilometerclient>=1.0.13
|
||||||
python-cinderclient>=1.2.0
|
python-cinderclient>=1.2.0
|
||||||
python-glanceclient>=0.15.0
|
python-glanceclient>=0.15.0
|
||||||
|
|
|
@ -46,6 +46,7 @@ oslo.config.opts =
|
||||||
heat_integrationtests.common.config = heat_integrationtests.common.config:list_opts
|
heat_integrationtests.common.config = heat_integrationtests.common.config:list_opts
|
||||||
|
|
||||||
heat.clients =
|
heat.clients =
|
||||||
|
barbican = heat.engine.clients.os.barbican:BarbicanClientPlugin
|
||||||
ceilometer = heat.engine.clients.os.ceilometer:CeilometerClientPlugin
|
ceilometer = heat.engine.clients.os.ceilometer:CeilometerClientPlugin
|
||||||
cinder = heat.engine.clients.os.cinder:CinderClientPlugin
|
cinder = heat.engine.clients.os.cinder:CinderClientPlugin
|
||||||
glance = heat.engine.clients.os.glance:GlanceClientPlugin
|
glance = heat.engine.clients.os.glance:GlanceClientPlugin
|
||||||
|
|
Loading…
Reference in New Issue