Port rally plugins to use proper modules

Sometime ago, all OpenStack related stuff moved from the main repository
to the separate one - https://github.com/openstack/rally-openstack .
All further development and maintance will be done only in a new
repository. As for first major release, the structure is not changed, so
only imports should be changed.

Also, this patch removes a hack for gnochiclient, since rally-openstack
1.1.0 includes fix Ib697bc115aee9c61ae30a5449a561178f3a65663 .

Change-Id: I94b3a437ada67749f9c2865f04e760060dcb7b77

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"

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

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_openstack import consts
-from rally.plugins.openstack.scenarios.neutron import utils as neutron_utils
+from rally_openstack.scenarios.glance.images import GlanceBasic
-from rally.plugins.openstack.scenarios.nova import utils as nova_utils
+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"})

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__)

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_openstack import consts
-from rally.plugins.openstack.scenarios.neutron import utils as neutron_utils
+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"})

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_openstack import consts
-from rally.plugins.openstack.scenarios.vm import utils as vm_utils
+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"})

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__)
 

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
 

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])

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])

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_openstack import consts
-from rally.plugins.openstack.scenarios.nova import utils as nova_utils
+from rally_openstack.scenarios.cinder import utils as cinder_utils
-from rally.plugins.openstack.scenarios.vm import utils as vm_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"})

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__)