diff --git a/ansible/install/group_vars/all.yml b/ansible/install/group_vars/all.yml index 8eefd23a1..3daddafa6 100644 --- a/ansible/install/group_vars/all.yml +++ b/ansible/install/group_vars/all.yml @@ -31,7 +31,7 @@ browbeat_venv: "{{browbeat_path}}/.browbeat-venv" rally_venv: "{{browbeat_path}}/.rally-venv" # Rally version to install -rally_version: 0.10.1 +rally_version: 1.1.0 # The default Shaker venv shaker_venv: "{{browbeat_path}}/.shaker-venv" diff --git a/ansible/install/roles/rally/tasks/main.yml b/ansible/install/roles/rally/tasks/main.yml index 987fad189..47431d341 100644 --- a/ansible/install/roles/rally/tasks/main.yml +++ b/ansible/install/roles/rally/tasks/main.yml @@ -15,20 +15,12 @@ line: 'export REQUESTS_CA_BUNDLE={{ overcloud_ca_path }}' when: overcloud_ca_path is defined -- name: Install rally into rally-venv +- name: Install Rally with OpenStack plugins into rally-venv pip: - name: rally + name: rally-openstack version: "{{ rally_version }}" virtualenv: "{{ rally_venv }}" -# (akrzos) Rally 0.10.1 installs a version (4.0.0) of gnocchiclient which deprecated service_type -# session option. -- name: Downgrade gnocchiclient in Rally venv - pip: - name: gnocchiclient - version: 3.3.1 - virtualenv: "{{ rally_venv }}" - - name: Install elasticsearch into rally-venv pip: name: elasticsearch diff --git a/rally/rally-plugins/glance/glance_create_boot_delete.py b/rally/rally-plugins/glance/glance_create_boot_delete.py index ee0caea10..755997658 100644 --- a/rally/rally-plugins/glance/glance_create_boot_delete.py +++ b/rally/rally-plugins/glance/glance_create_boot_delete.py @@ -10,13 +10,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -from rally.plugins.openstack.scenarios.glance.images import GlanceBasic -from rally.plugins.openstack.scenarios.neutron import utils as neutron_utils -from rally.plugins.openstack.scenarios.nova import utils as nova_utils +from rally_openstack import consts +from rally_openstack.scenarios.glance.images import GlanceBasic +from rally_openstack.scenarios.neutron import utils as neutron_utils +from rally_openstack.scenarios.nova import utils as nova_utils from rally.task import scenario from rally.task import types from rally.task import validation -from rally import consts @types.convert(flavor={"type": "nova_flavor"}, image_location={"type": "path_or_url"}) diff --git a/rally/rally-plugins/gnocchi/gnocchi.py b/rally/rally-plugins/gnocchi/gnocchi.py index 176ac4ad3..528ceb82d 100644 --- a/rally/rally-plugins/gnocchi/gnocchi.py +++ b/rally/rally-plugins/gnocchi/gnocchi.py @@ -12,13 +12,13 @@ import uuid -from rally.plugins.openstack import osclients -from rally.plugins.openstack import scenario from rally.common import logging +from rally_openstack import consts +from rally_openstack import osclients +from rally_openstack import scenario from rally.task import atomic from rally.task import context from rally.task import validation -from rally import consts LOG = logging.getLogger(__name__) diff --git a/rally/rally-plugins/netcreate-boot/netcreate_nova_boot.py b/rally/rally-plugins/netcreate-boot/netcreate_nova_boot.py index cc5360f21..7d26a22a9 100644 --- a/rally/rally-plugins/netcreate-boot/netcreate_nova_boot.py +++ b/rally/rally-plugins/netcreate-boot/netcreate_nova_boot.py @@ -10,12 +10,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -from rally.plugins.openstack.scenarios.nova import utils as nova_utils -from rally.plugins.openstack.scenarios.neutron import utils as neutron_utils +from rally_openstack import consts +from rally_openstack.scenarios.nova import utils as nova_utils +from rally_openstack.scenarios.neutron import utils as neutron_utils from rally.task import scenario from rally.task import types from rally.task import validation -from rally import consts @types.convert(image={"type": "glance_image"}, flavor={"type": "nova_flavor"}) diff --git a/rally/rally-plugins/netcreate-boot/netcreate_nova_boot_fip_ping.py b/rally/rally-plugins/netcreate-boot/netcreate_nova_boot_fip_ping.py index e95b4e879..8a93f330e 100644 --- a/rally/rally-plugins/netcreate-boot/netcreate_nova_boot_fip_ping.py +++ b/rally/rally-plugins/netcreate-boot/netcreate_nova_boot_fip_ping.py @@ -10,13 +10,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -from rally.plugins.openstack.scenarios.neutron import utils as neutron_utils -from rally.plugins.openstack.scenarios.vm import utils as vm_utils +from rally_openstack import consts +from rally_openstack.scenarios.neutron import utils as neutron_utils +from rally_openstack.scenarios.vm import utils as vm_utils from rally.task import atomic from rally.task import scenario from rally.task import types from rally.task import validation -from rally import consts @types.convert(image={"type": "glance_image"}, flavor={"type": "nova_flavor"}) diff --git a/rally/rally-plugins/neutron/neutron.py b/rally/rally-plugins/neutron/neutron.py index 8ccc0cb88..2d8608a46 100644 --- a/rally/rally-plugins/neutron/neutron.py +++ b/rally/rally-plugins/neutron/neutron.py @@ -11,9 +11,9 @@ # under the License. from rally.common import logging -from rally.plugins.openstack.context.network import networks +from rally_openstack import consts +from rally_openstack.context.network import networks from rally.task import context -from rally import consts LOG = logging.getLogger(__name__) diff --git a/rally/rally-plugins/neutron/port_create_assoicate.py b/rally/rally-plugins/neutron/port_create_assoicate.py index cf246d6e6..b71e974ff 100644 --- a/rally/rally-plugins/neutron/port_create_assoicate.py +++ b/rally/rally-plugins/neutron/port_create_assoicate.py @@ -10,10 +10,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from rally.plugins.openstack.scenarios.neutron import utils as neutron_utils +from rally_openstack import consts +from rally_openstack.scenarios.neutron import utils as neutron_utils from rally.task import scenario from rally.task import validation -from rally import consts import subprocess import time diff --git a/rally/rally-plugins/neutron/router_subnet_create_delete.py b/rally/rally-plugins/neutron/router_subnet_create_delete.py index 384ac4893..9fc5e214b 100644 --- a/rally/rally-plugins/neutron/router_subnet_create_delete.py +++ b/rally/rally-plugins/neutron/router_subnet_create_delete.py @@ -10,10 +10,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from rally.plugins.openstack.scenarios.neutron import utils as neutron_utils +from rally_openstack import consts +from rally_openstack.scenarios.neutron import utils as neutron_utils from rally.task import scenario from rally.task import validation -from rally import consts @validation.add("required_services",services=[consts.Service.NEUTRON]) diff --git a/rally/rally-plugins/neutron/securitygroup_port.py b/rally/rally-plugins/neutron/securitygroup_port.py index 4a638cb0d..38a8d135a 100644 --- a/rally/rally-plugins/neutron/securitygroup_port.py +++ b/rally/rally-plugins/neutron/securitygroup_port.py @@ -10,10 +10,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from rally.plugins.openstack.scenarios.neutron import utils as neutron_utils +from rally_openstack import consts +from rally_openstack.scenarios.neutron import utils as neutron_utils from rally.task import scenario from rally.task import validation -from rally import consts @validation.add("required_services",services=[consts.Service.NEUTRON]) diff --git a/rally/rally-plugins/nova/nova.py b/rally/rally-plugins/nova/nova.py index 408ea1d03..34c20e107 100644 --- a/rally/rally-plugins/nova/nova.py +++ b/rally/rally-plugins/nova/nova.py @@ -10,13 +10,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -from rally.plugins.openstack.scenarios.cinder import utils as cinder_utils -from rally.plugins.openstack.scenarios.nova import utils as nova_utils -from rally.plugins.openstack.scenarios.vm import utils as vm_utils +from rally_openstack import consts +from rally_openstack.scenarios.cinder import utils as cinder_utils +from rally_openstack.scenarios.nova import utils as nova_utils +from rally_openstack.scenarios.vm import utils as vm_utils from rally.task import scenario from rally.task import types from rally.task import validation -from rally import consts @types.convert(image={"type": "glance_image"}, flavor={"type": "nova_flavor"}) diff --git a/rally/rally-plugins/workloads/pbench-uperf.py b/rally/rally-plugins/workloads/pbench-uperf.py index 6789f17b0..9fb8fb588 100644 --- a/rally/rally-plugins/workloads/pbench-uperf.py +++ b/rally/rally-plugins/workloads/pbench-uperf.py @@ -19,13 +19,13 @@ import time import browbeat.elastic -from rally.plugins.openstack.scenarios.vm import utils as vm_utils -from rally.plugins.openstack.scenarios.neutron import utils as neutron_utils from rally.common import sshutils +from rally_openstack import consts +from rally_openstack.scenarios.vm import utils as vm_utils +from rally_openstack.scenarios.neutron import utils as neutron_utils from rally.task import scenario from rally.task import types from rally.task import validation -from rally import consts LOG = logging.getLogger(__name__)