Pin Rally version

Pins rally to its latest version and updates the
rally plugins to be compatible. Tested on my own cloud
without issues.

Change-Id: I6c8207b91b2863ee4a67181f4d87e70aff77000e
This commit is contained in:
jkilpatr 2016-07-25 12:49:02 -04:00
parent 30d46d2dca
commit 47f32861af
4 changed files with 8 additions and 7 deletions

View File

@ -90,7 +90,7 @@
virtualenv={{ perfkit_venv }}
- name: Install rally into rally-venv
pip: name=rally virtualenv={{ rally_venv }}
pip: name=rally version=0.5.0 virtualenv={{ rally_venv }}
- name: Setup rally database
shell: . {{ rally_venv }}/bin/activate; rally-manage db recreate

View File

@ -31,8 +31,8 @@ class NeutronBootFipPingPlugin(neutron_utils.NeutronScenario,
# Cleanup
#
@types.set(image=types.ImageResourceType,
flavor=types.FlavorResourceType)
@types.convert(image={"type": "glance_image"},
flavor={"type": "nova_flavor"})
@validation.image_valid_on_flavor("flavor", "image")
@validation.required_openstack(users=True)
@scenario.configure(context={"cleanup": ["nova", "neutron"],

View File

@ -21,8 +21,8 @@ class BrowbeatPlugin(neutron_utils.NeutronScenario,
nova_utils.NovaScenario,
scenario.Scenario):
@types.set(image=types.ImageResourceType,
flavor=types.FlavorResourceType)
@types.convert(image={"type": "glance_image"},
flavor={"type": "nova_flavor"})
@validation.image_valid_on_flavor("flavor", "image")
@validation.required_openstack(users=True)
@scenario.configure(context={"cleanup": ["nova", "neutron"]})

View File

@ -17,8 +17,9 @@ from rally.task import validation
class NeutronPlugin(neutron_utils.NeutronScenario,
scenario.Scenario):
@types.set(image=types.ImageResourceType,
flavor=types.FlavorResourceType)
@types.convert(image={"type": "glance_image"},
flavor={"type": "nova_flavor"})
@validation.required_openstack(users=True)
@scenario.configure(context={"cleanup": ["neutron"]})
def create_router_and_net(self,num_networks=1,network_create_args=None,