x/browbeat
Code Issues Proposed changes

Merge "Pin Rally version"

Browse Source
This commit is contained in:
Jenkins 2016-08-03 17:45:19 +00:00 committed by Gerrit Code Review
commit e28ca5fcb7
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/install/roles/browbeat/tasks/main.yml
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

4
rally/rally-plugins/netcreate-boot-ping/netcreate_nova-boot-fip-ping.py
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"],

4
rally/rally-plugins/netcreate-boot/netcreate_boot.py
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"]})

5
rally/rally-plugins/subnet-router-create/subnet-router-create.py
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,