From 950207a2bb0b4ad65927800c712747be925a8834 Mon Sep 17 00:00:00 2001
From: akrzos <akrzos@redhat.com>
Date: Mon, 30 Jan 2017 08:22:17 -0500
Subject: [PATCH] Update to Rally 0.8.1

+ Add one more KeystoneBasic Scenario

Change-Id: I670f090529c7bd565f4e897d1030ee80ca82117a
---
 ansible/install/group_vars/all.yml            |  2 +-
 conf/browbeat-keystone-complete.yaml          |  6 +++++
 conf/browbeat-keystone-minimal.yaml           |  6 +++++
 .../keystonebasic/create_and_get_role-cc.yml  | 23 +++++++++++++++++++
 4 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 rally/keystonebasic/create_and_get_role-cc.yml

diff --git a/ansible/install/group_vars/all.yml b/ansible/install/group_vars/all.yml
index 2dd736531..41f2b732a 100644
--- a/ansible/install/group_vars/all.yml
+++ b/ansible/install/group_vars/all.yml
@@ -29,7 +29,7 @@ browbeat_venv: /home/stack/browbeat-venv
 rally_venv: /home/stack/rally-venv
 
 # Rally version to install
-rally_version: 0.7.0
+rally_version: 0.8.1
 
 # The default Shaker venv
 shaker_venv: /home/stack/shaker-venv
diff --git a/conf/browbeat-keystone-complete.yaml b/conf/browbeat-keystone-complete.yaml
index 8f44adcf6..beebe3f1e 100644
--- a/conf/browbeat-keystone-complete.yaml
+++ b/conf/browbeat-keystone-complete.yaml
@@ -8,6 +8,7 @@ elasticsearch:
   enabled: false
   host: 1.1.1.1
   port: 9200
+  regather: true
   metadata_files:
     - name: hardware-metadata
       file: metadata/hardware-metadata.json
@@ -204,3 +205,8 @@ rally:
           file: rally/keystonebasic/create_and_delete_ec2credentials-cc.yml
           sla_max_seconds: 30
           sla_max_failure: 0
+        - name: create-and-get-role
+          enabled: true
+          file: rally/keystonebasic/create_and_get_role-cc.yml
+          sla_max_seconds: 30
+          sla_max_failure: 0
diff --git a/conf/browbeat-keystone-minimal.yaml b/conf/browbeat-keystone-minimal.yaml
index 14b818e21..ba6335945 100644
--- a/conf/browbeat-keystone-minimal.yaml
+++ b/conf/browbeat-keystone-minimal.yaml
@@ -8,6 +8,7 @@ elasticsearch:
   enabled: false
   host: 1.1.1.1
   port: 9200
+  regather: true
   metadata_files:
     - name: hardware-metadata
       file: metadata/hardware-metadata.json
@@ -196,3 +197,8 @@ rally:
           file: rally/keystonebasic/create_and_delete_ec2credentials-cc.yml
           sla_max_seconds: 30
           sla_max_failure: 0
+        - name: create-and-get-role
+          enabled: true
+          file: rally/keystonebasic/create_and_get_role-cc.yml
+          sla_max_seconds: 30
+          sla_max_failure: 0
diff --git a/rally/keystonebasic/create_and_get_role-cc.yml b/rally/keystonebasic/create_and_get_role-cc.yml
new file mode 100644
index 000000000..09510f524
--- /dev/null
+++ b/rally/keystonebasic/create_and_get_role-cc.yml
@@ -0,0 +1,23 @@
+{% set sla_max_avg_duration = sla_max_avg_duration or 60 %}
+{% set sla_max_failure = sla_max_failure or 0 %}
+{% set sla_max_seconds = sla_max_seconds or 60 %}
+---
+  KeystoneBasic.create_and_get_role:
+    -
+      args: {}
+      context:
+        users:
+          project_domain: "default"
+          resource_management_workers: 30
+          tenants: 1
+          user_domain: "default"
+          users_per_tenant: 8
+      runner:
+        concurrency: {{concurrency}}
+        times: {{times}}
+        type: "constant"
+      sla:
+        max_avg_duration: {{sla_max_avg_duration}}
+        max_seconds_per_iteration: {{sla_max_seconds}}
+        failure_rate:
+          max: {{sla_max_failure}}