Added Cinder + Ceph multirole auto test

Change-Id: Ib680b5762ceffd3edcfbc75628cd631d293760d0
This commit is contained in:
Iryna Vovk
2016-01-27 17:35:21 +02:00
parent 6225894ee9
commit 9ba3bf5ed6
3 changed files with 88 additions and 16 deletions

View File

@@ -64,8 +64,7 @@ def install_packages(obj, remote):
os.path.isfile(obj.add_package)
def prepare_contrail_plugin(
obj, slaves=None, pub_all_nodes=False, ceph_value=False):
def prepare_contrail_plugin(obj, slaves=None, options={}):
"""Copy necessary packages to the master node and install them"""
obj.env.revert_snapshot("ready_with_%d_slaves" % slaves)
@@ -88,7 +87,7 @@ def prepare_contrail_plugin(
install_packages(obj, obj.env.d_env.get_admin_remote())
# prepare fuel
openstack.assign_net_provider(obj, pub_all_nodes, ceph_value)
openstack.assign_net_provider(obj, options)
def activate_plugin(obj):