commit c368eb6c49b6bac24ad65e6c20516414437e2e7a
author koder aka kdanilov <kdanilov@mirantis.com> Tue Apr 28 18:22:01 2015 +0300
committer koder aka kdanilov <kdanilov@mirantis.com> Fri May 01 17:25:10 2015 +0300
tree 53f132d14e23741bab0724ee12acae358de16b27
parent 70d2e10bd2083bf5b1499c48c369c1fb1587b3f0

improve OS preparation, change config structure

configs/ceph_perf.yaml

diff --git a/configs/ceph_perf.yaml b/configs/ceph_perf.yaml
new file mode 100644
index 0000000..c8466c1
--- /dev/null
+++ b/configs/ceph_perf.yaml
@@ -0,0 +1,49 @@
+clouds:
+    fuel:
+        url: http://172.16.52.114:8000/
+        creds: admin:admin@admin
+        ssh_creds: root:test37
+        openstack_env: test
+
+# discover: fuel_openrc_only
+
+internal:
+    var_dir_root: /tmp/perf_tests
+
+logging:
+    extra_logs: 1
+
+vm_configs:
+    wally_1024:
+        image:
+            name: wally_ubuntu
+            url: https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img
+            creds: "ssh://ubuntu@{ip}::{private_key_path}"
+
+        flavor:
+            name: wally_1024
+            hdd_size: 50
+            ram_size: 1024
+            cpu_count: 1
+
+        vol_sz: 30
+        keypair_name: wally_vm_key
+        name_templ: wally-{group}-{id}
+        aa_group_name: wally-aa-{0}
+        security_group: wally_ssh_to_everyone
+
+tests:
+    - start_test_nodes:
+        openstack:
+            creds: /tmp/perf_tests/personalistic_sharron/test_openrc
+            count: x4
+            cfg_name: wally_1024
+            network_zone_name: net04
+            flt_ip_pool: net04_ext
+
+        tests:
+            - io:
+                cfg: ceph
+                params:
+                    FILENAME: /dev/vdb
+                    NUM_ROUNDS: 1

configs/config.yaml

diff --git a/configs/config.yaml b/configs/config.yaml
index a5a4b16..522fcd3 100644
--- a/configs/config.yaml
+++ b/configs/config.yaml
@@ -22,19 +22,34 @@
 internal:
     var_dir_root: /tmp/perf_tests
 
+vm_configs:
+    wally_1024:
+        image:
+            name: wally_ubuntu
+            url: https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img
+            creds: "ssh://ubuntu@{ip}::{private_key_path}"
+
+        flavor:
+            name: wally_1024
+            hdd_size: 50
+            ram_size: 1024
+            cpu_count: 1
+
+        vol_sz: 30
+        keypair_name: wally_vm_key
+        name_templ: wally-{group}-{id}
+        aa_group_name: wally-aa-{0}
+        security_group: wally_ssh_to_everyone
+
 tests:
     - start_test_nodes:
         openstack:
-            creds: clouds
-            vm_params:
-                count: x2
-                img_name: disk_io_perf
-                flavor_name: disk_io_perf.256
-                keypair_name: disk_io_perf
-                network_zone_name: novanetwork
-                flt_ip_pool: nova
-                creds: "ssh://ubuntu@{0}::disk_io_perf.pem"
-                name_templ: disk_io_perf-{0}
+            creds: /tmp/perf_tests/personalistic_sharron/test_openrc
+            count: x1
+            cfg_name: wally_1024
+            network_zone_name: net04
+            flt_ip_pool: net04_ext
+
         tests:
             - io:
                 cfg: tests/io_scenario_hdd.cfg