Update plugin settings

- Fixed problem with roles list
- Removed unused options

Change-Id: I25abe76a98c38d2da774c036f71d221b24ad21eb
This commit is contained in:
Victor Ryzhenkin 2016-07-14 21:13:41 +03:00
parent 6ac2a3f4d3
commit 172968f5ab
3 changed files with 2 additions and 7 deletions

View File

@ -125,6 +125,7 @@ class PluginHelper(object):
:type options: boolean :type options: boolean
:returns: None :returns: None
""" """
if options is None: if options is None:
options = {} options = {}
msg = "Plugin {0} isn't found.".format(name) msg = "Plugin {0} isn't found.".format(name)

View File

@ -17,18 +17,14 @@ from murano_plugin_tests import settings
name = 'detach-murano' name = 'detach-murano'
role_name = ['murano-node'] role_name = 'murano-node'
plugin_path = settings.MURANO_PLUGIN_PATH plugin_path = settings.MURANO_PLUGIN_PATH
version = helpers.get_plugin_version(plugin_path) version = helpers.get_plugin_version(plugin_path)
murano_user = 'murano'
murano_db_password = 'murano_db_password'
glare = True glare = True
a_o_o = 'http://storage.apps.openstack.org/' a_o_o = 'http://storage.apps.openstack.org/'
default_options = { default_options = {
'murano_user_password/value': murano_user,
'murano_db_password/value': murano_db_password,
'murano_glance_artifacts/value': glare, 'murano_glance_artifacts/value': glare,
'murano_repo_url/value': a_o_o 'murano_repo_url/value': a_o_o
} }

View File

@ -18,7 +18,6 @@ from plugin_settings import base_nodes
from proboscis import test from proboscis import test
@test(groups=["plugins"]) @test(groups=["plugins"])
class TestMuranoPluginBvt(api.MuranoPluginApi): class TestMuranoPluginBvt(api.MuranoPluginApi):
"""Class for bvt testing the Murano plugin.""" """Class for bvt testing the Murano plugin."""
@ -43,7 +42,6 @@ class TestMuranoPluginBvt(api.MuranoPluginApi):
Duration 120m Duration 120m
Snapshot deploy_murano_bvt Snapshot deploy_murano_bvt
""" """
self.check_run("deploy_ceilometer_redis")
self.env.revert_snapshot("ready_with_5_slaves") self.env.revert_snapshot("ready_with_5_slaves")
self.prepare_plugin() self.prepare_plugin()