Permalink
Browse files

Merge "Upgrade Rally and PerfKit"

  • Loading branch information...
Zuul authored and openstack-gerrit committed Jan 2, 2018
2 parents e7ce1f7 + 8c84205 commit e56bba79b841c2500f810f8c250d548e256ec16f
@@ -31,7 +31,7 @@ browbeat_venv: "{{browbeat_path}}/.browbeat-venv"
rally_venv: "{{browbeat_path}}/.rally-venv"
# Rally version to install
rally_version: 0.9.1
rally_version: 0.10.1
# The default Shaker venv
shaker_venv: "{{browbeat_path}}/.shaker-venv"
@@ -41,7 +41,7 @@ shaker_version: 1.1.0
# PerfKitBenchmarker Settings
perfkit_venv: "{{browbeat_path}}/.perfkit-venv"
perfkit_version: v1.12.0
perfkit_version: v1.13.0
# Configuration items to adjust browbeat results served through httpd
browbeat_results_port: 9001
@@ -21,12 +21,12 @@
version: "{{ rally_version }}"
virtualenv: "{{ rally_venv }}"
# https://github.com/openstack/rally/blob/master/requirements.txt#L6
# remove when os-faults is fixed and rally is upgraded
- name: Downgrade ansible in 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: ansible
version: 2.3.2.0
name: gnocchiclient
version: 3.3.1
virtualenv: "{{ rally_venv }}"
- name: Install elasticsearch into rally-venv
View
@@ -89,7 +89,7 @@ def update_scenarios(self):
self.scenario_count += 1
def get_task_id(self, test_name):
cmd = "grep \"rally task results\" {}.log | awk '{{print $4}}'".format(
cmd = "grep \"rally task report [a-z0-9\-]* --out\" {}.log | awk '{{print $4}}'".format(
test_name)
return self.tools.run_cmd(cmd)['stdout']
@@ -0,0 +1,143 @@
# Stress test designed for telemetry services (ceilometer, gnocchi) by
# booting persisting xtiny cirros instances. It boots 100 each iteration
# with a concurrency of 20 instances. A total of 1000 instances are
# booted. The instances have a volume.
browbeat:
cloud_name: openstack
rerun: 1
rerun_type: iteration
ansible:
hosts: ansible/hosts
metadata_playbook: ansible/gather/site.yml
ssh_config: ansible/ssh-config
elasticsearch:
enabled: false
host: 1.1.1.1
port: 9200
regather: false
metadata_files:
- name: hardware-metadata
file: metadata/hardware-metadata.json
- name: environment-metadata
file: metadata/environment-metadata.json
- name: software-metadata
file: metadata/software-metadata.json
- name: version
file: metadata/version.json
grafana:
enabled: true
host: example.grafana.com
port: 3000
dashboards:
- openstack-general-system-performance
perfkit:
sleep_before: 0
sleep_after: 0
default:
image: centos7
machine_type: m1.small
os_type: rhel
openstack_image_username: centos
openstack_floating_ip_pool: browbeat_public
openstack_network: browbeat_private
timing_measurements: runtimes
ignore_package_requirements: true
rally:
sleep_before: 0
sleep_after: 0
plugins:
- browbeat: rally/rally-plugins/browbeat
- nova: rally/rally-plugins/nova
- neutron: rally/rally-plugins/neutron
shaker:
server: 1.1.1.1
port: 5555
flavor: m1.small
join_timeout: 600
sleep_before: 0
sleep_after: 0
shaker_region: regionOne
external_host: 2.2.2.2
yoda:
instackenv: "/home/stack/instackenv.json"
stackrc: "/home/stack/stackrc"
workloads:
# Boots a total of 1000 instances, 100 at a time with 30minutes between booting storms
- name: BrowbeatNovaPersistWithVolume01
enabled: true
type: rally
concurrency:
- 20
times: 100
scenarios:
- name: nova-boot-persist-with-volume-100-01
enabled: true
image_name: cirros
flavor_name: m1.xtiny
volume_size: 1
cleanup_delay: 1800
file: rally/rally-plugins/nova/nova_boot_persist_with_volume.yml
- name: nova-boot-persist-with-volume-100-02
enabled: true
image_name: cirros
flavor_name: m1.xtiny
volume_size: 1
cleanup_delay: 1800
file: rally/rally-plugins/nova/nova_boot_persist_with_volume.yml
- name: nova-boot-persist-with-volume-100-03
enabled: true
image_name: cirros
flavor_name: m1.xtiny
volume_size: 1
cleanup_delay: 1800
file: rally/rally-plugins/nova/nova_boot_persist_with_volume.yml
- name: nova-boot-persist-with-volume-100-04
enabled: true
image_name: cirros
flavor_name: m1.xtiny
volume_size: 1
cleanup_delay: 1800
file: rally/rally-plugins/nova/nova_boot_persist_with_volume.yml
- name: nova-boot-persist-with-volume-100-05
enabled: true
image_name: cirros
flavor_name: m1.xtiny
volume_size: 1
cleanup_delay: 1800
file: rally/rally-plugins/nova/nova_boot_persist_with_volume.yml
- name: nova-boot-persist-with-volume-100-06
enabled: true
image_name: cirros
flavor_name: m1.xtiny
volume_size: 1
cleanup_delay: 1800
file: rally/rally-plugins/nova/nova_boot_persist_with_volume.yml
- name: nova-boot-persist-with-volume-100-07
enabled: true
image_name: cirros
flavor_name: m1.xtiny
volume_size: 1
cleanup_delay: 1800
file: rally/rally-plugins/nova/nova_boot_persist_with_volume.yml
- name: nova-boot-persist-with-volume-100-08
enabled: true
image_name: cirros
flavor_name: m1.xtiny
volume_size: 1
cleanup_delay: 1800
file: rally/rally-plugins/nova/nova_boot_persist_with_volume.yml
- name: nova-boot-persist-with-volume-100-09
enabled: true
image_name: cirros
flavor_name: m1.xtiny
volume_size: 1
cleanup_delay: 1800
file: rally/rally-plugins/nova/nova_boot_persist_with_volume.yml
- name: nova-boot-persist-with-volume-100-10
enabled: true
image_name: cirros
flavor_name: m1.xtiny
volume_size: 1
cleanup_delay: 1800
file: rally/rally-plugins/nova/nova_boot_persist_with_volume.yml
View
@@ -20,6 +20,11 @@ Scenario - nova_boot_persist
This scenario creates instances without a network that persist upon completion of a rally run. This scenario is best used for excerising the Telemetry systems within an OpenStack Cloud. Alternatively, it can be used to put idle instances on a cloud for other workloads to compete for resources. The scenario is referenced in the Telemetry Browbeat configurations in order to build a "stepped" workload that can be used to analyze Telemetry performance and scalability.
Scenario - nova_boot_persist_with_volume
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
This scenario creates instances that have an attached volume and persist upon completion of a rally run. This scenario is best used for excerising the Telemetry systems within an OpenStack Cloud. It increases the Telemetry workload by creating more resources that the Telemetry services must collect and process metrics over. Alternatively, it can be used to put idle instances on a cloud for other workloads to compete for resources. The scenario is referenced in the Telemetry Browbeat configurations in order to build a "stepped" workload that can be used to analyze Telemetry scalability.
Scenario - nova_boot_persist_with_network
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -12,7 +12,6 @@
import time
from rally.common.i18n import _
from rally.common import logging
from rally.task import context
from rally import consts
@@ -41,13 +40,11 @@ class BrowbeatDelay(context.Context):
"additionalProperties": False
}
@logging.log_task_wrapper(LOG.info, _("Enter context: `browbeat_delay`"))
def setup(self):
if self.config.get('setup_delay'):
LOG.info('Setup Delaying: {}'.format(self.config.get('setup_delay')))
time.sleep(self.config.get('setup_delay'))
@logging.log_task_wrapper(LOG.info, _("Exit context: `browbeat_delay`"))
def cleanup(self):
if self.config.get('cleanup_delay'):
LOG.info('Cleanup Delaying: {}'.format(self.config.get('cleanup_delay')))
@@ -10,7 +10,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from rally.plugins.openstack.scenarios.glance import utils as glance_utils
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.task import scenario
@@ -19,22 +19,23 @@
from rally import consts
@types.convert(flavor={"type": "nova_flavor"},
image_location={"type": "path_or_url"})
@validation.required_services(consts.Service.GLANCE, consts.Service.NEUTRON, consts.Service.NOVA)
@validation.required_openstack(users=True)
@scenario.configure(context={"cleanup": ["glance", "neutron", "nova"]},
name="BrowbeatPlugin.glance_create_boot_delete")
class GlanceCreateBootDelete(glance_utils.GlanceScenario,
neutron_utils.NeutronScenario,
nova_utils.NovaScenario):
@types.convert(flavor={"type": "nova_flavor"}, image_location={"type": "path_or_url"})
@validation.add("required_services",
services=[consts.Service.GLANCE, consts.Service.NEUTRON, consts.Service.NOVA])
@validation.add("required_platform", platform="openstack", users=True)
@scenario.configure(context={"cleanup@openstack": ["glance", "neutron", "nova"]},
name="BrowbeatPlugin.glance_create_boot_delete",
platform="openstack")
class GlanceCreateBootDelete(GlanceBasic, neutron_utils.NeutronScenario, nova_utils.NovaScenario):
def run(self, container_format, image_location, disk_format, flavor,
network_create_args=None, subnet_create_args=None, **kwargs):
image = self._create_image(container_format, image_location, disk_format, **kwargs)
image = self.glance.create_image(
container_format=container_format, image_location=image_location,
disk_format=disk_format)
net = self._create_network(network_create_args or {})
self._create_subnet(net, subnet_create_args or {})
kwargs['nics'] = [{'net-id': net['network']['id']}]
server = self._boot_server(image.id, flavor, **kwargs)
self._delete_server(server)
self._delete_image(image)
self.glance.delete_image(image.id)
Oops, something went wrong.

0 comments on commit e56bba7

Please sign in to comment.