Cleanup the config files.

Change-Id: I3f529176375c10627316f8c45ff1a392ae4edf99

ansible/browbeat/adjustment-keystone-token.yml

@@ -3,8 +3,8 @@
 # Playbook to change token type from uuid to fernet and back for keystone.
 #
 # Examples:
-# ansible-playbook -i hosts browbeat/keystone_token_type.yml -e "token_provider=fernet"
+# ansible-playbook -i hosts browbeat/adjustment-keystone-token.yml -e "token_provider=fernet"
-# ansible-playbook -i hosts browbeat/keystone_token_type.yml -e "token_provider=uuid"
+# ansible-playbook -i hosts browbeat/adjustment-keystone-token.yml -e "token_provider=uuid"
 #
 
 - hosts: controller

browbeat-complete.yaml

@@ -2,11 +2,8 @@
 browbeat:
   results : results/
   sudo: true
-  debug: false
-  rally_venv: /home/stack/browbeat-venv/bin/activate
   connmon: true
   rerun: 3
-  num_workers: None
 ansible:
   hosts: ansible/hosts
   install:
@@ -14,8 +11,10 @@ ansible:
     browbeat: ansible/install/browbeat.yml
   check: ansible/check/site.yml
   adjust:
-    workers: ansible/browbeat/adjustment.yml
+    keystone_token: ansible/browbeat/adjustment-keystone-token.yml
-    keystone-token: browbeat/keystone_token_type.yml
+    neutron_l3: ansible/browbeat/adjustment-l3.yml
+    nova_db: ansible/browbeat/adjustment-db.yml
+    workers: ansible/browbeat/adjustment-workers.yml
 grafana:
   enabled: true
   cloud_name: openstack
@@ -23,6 +22,7 @@ grafana:
     - openstack-general-system-performance
   url: http://grafana-host.example.com:3000/dashboard/db/
 rally:
+  venv: /home/stack/browbeat-venv/bin/activate
   benchmarks:
     cinder:
       enabled: true

browbeat-config.yaml

@@ -2,11 +2,8 @@
 browbeat:
   results : results/
   sudo: true
-  debug: false
   connmon: true
-  rally_venv: /home/stack/browbeat-venv/bin/activate
   rerun: 1
-  num_workers: None
 ansible:
   hosts: ansible/hosts
   install:
@@ -14,8 +11,10 @@ ansible:
     browbeat: ansible/install/browbeat.yml
   check: ansible/check/site.yml
   adjust:
-    workers: ansible/browbeat/adjustment.yml
+    keystone_token: ansible/browbeat/adjustment-keystone-token.yml
-    keystone-token: browbeat/keystone_token_type.yml
+    neutron_l3: ansible/browbeat/adjustment-l3.yml
+    nova_db: ansible/browbeat/adjustment-db.yml
+    workers: ansible/browbeat/adjustment-workers.yml
 grafana:
   enabled: true
   cloud_name: openstack
@@ -23,6 +22,7 @@ grafana:
     - openstack-general-system-performance
   url: http://grafana-host.example.com:3000/dashboard/db/
 rally:
+  venv: /home/stack/browbeat-venv/bin/activate
   benchmarks:
     cinder:
       enabled: true
@@ -63,7 +63,7 @@ rally:
       enabled: true
       concurrency:
         - 8
-      times: 40
+      times: 10
       scenarios:
         boot-list-centos:
           enabled: false

lib/Rally.py

@@ -28,7 +28,7 @@ class Rally:
 
         from_ts = int(time.time() * 1000)
         task_args = str(scenario_args).replace("'", "\"")
-        cmd = "source {}; \\".format(self.config['browbeat']['rally_venv'])
+        cmd = "source {}; \\".format(self.config['rally']['venv'])
         cmd +="rally task start {} --task-args \'{}\' 2>&1 | tee {}.log".format(task_file,
             task_args, test_name)
         self.tools.run_cmd(cmd)