fix config file examples, houskeeping, etc
diff --git a/configs-examples/ceph_fuel.yaml b/configs-examples/ceph_fuel.yaml
index 7018e86..0e1fb7b 100644
--- a/configs-examples/ceph_fuel.yaml
+++ b/configs-examples/ceph_fuel.yaml
@@ -1,43 +1,24 @@
+include: default.yaml
+lab_name: ${LAB_NAME}
+
clouds:
fuel:
- url: http://FUEL_WEB_IP:8000/
- creds: USER:PASSWD@TENANT #admin:admin@admin
- ssh_creds: root:FUEL_SSH_PASSWD
- openstack_env: OPENSTACK_ENV_NAME
+ url: http://${FUEL_WEBUI_IP}:8000/
+
+ # fuel UI creds
+ creds: ${USER}:${PASSWD}@${TENANT} #admin:admin@admin
+
+ # fuel master ssh passwd
+ ssh_creds: root:${FUEL_SSH_PASSWD}
+
+ # openstack environment
+ openstack_env: ${OPENSTACK_ENV_NAME}
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
- # creds: ENV
- creds: clouds
count: x1
cfg_name: wally_1024
network_zone_name: net04
@@ -48,4 +29,4 @@
cfg: ceph
params:
FILENAME: /dev/vdb
- NUM_ROUNDS: 7
+ TEST_FILE_SIZE: 100G
diff --git a/configs-examples/ceph_raw.yaml b/configs-examples/ceph_raw.yaml
index 646945f..9520a2f 100644
--- a/configs-examples/ceph_raw.yaml
+++ b/configs-examples/ceph_raw.yaml
@@ -1,12 +1,14 @@
+include: default.yaml
+
clouds:
- ceph: ssh://USER@ANY_CEPH_NODE::KEY_FILE
+ ceph: ssh://${USER}@${ANY_CEPH_NODE}::${KEY_FILE}
discover: ceph
explicit_nodes:
- "ssh://TEST_USER@TESTNODE1::KEY_FILE": testnode
- "ssh://TEST_USER@TESTNODE2::KEY_FILE": testnode
- "ssh://TEST_USER@TESTNODE3::KEY_FILE": testnode
+ "ssh://${TEST_USER}@${TESTNODE1}::${KEY_FILE}": testnode
+ "ssh://${TEST_USER}@${TESTNODE2}::${KEY_FILE}": testnode
+ "ssh://${TEST_USER}@${TESTNODE3}::${KEY_FILE}": testnode
sensors:
roles_mapping:
@@ -17,11 +19,5 @@
- io:
cfg: ceph
params:
- FILENAME: /dev/rbd/rbd/RBD_DEV_NAME_OR_LINK
- NUM_ROUNDS: 7
-
-internal:
- var_dir_root: /tmp/perf_tests
-
-logging:
- extra_logs: 1
+ FILENAME: /dev/rbd/rbd/${RBD_DEV_NAME_OR_LINK}
+ FILESIZE: ${FILESIZE}
diff --git a/configs-examples/db_raw.yaml b/configs-examples/db_raw.yaml
index 10104be..9d74c17 100644
--- a/configs-examples/db_raw.yaml
+++ b/configs-examples/db_raw.yaml
@@ -1,5 +1,7 @@
+include: default.yaml
+
explicit_nodes:
- "ssh://root@192.168.59.104::/home/yportnova/.ssh/id_rsa": testnode
+ "ssh://root@${NODE_IP}::${KEY_NAME}": testnode
tests:
- pgbench:
@@ -7,9 +9,3 @@
transactions_per_client: 2
- mysql:
warehouses: 20
-
-internal:
- var_dir_root: /tmp/perf_tests
-
-logging:
- extra_logs: 1
diff --git a/configs-examples/default.yaml b/configs-examples/default.yaml
new file mode 100644
index 0000000..8750bc3
--- /dev/null
+++ b/configs-examples/default.yaml
@@ -0,0 +1,27 @@
+settings:
+ collect_info: false
+ suspend_unused_vms: false
+ results_storage: /var/wally_results
+ log_level: DEBUG
+
+vm_configs:
+ keypair_file_private: wally_vm_key.pem
+ keypair_file_public: wally_vm_key.pub
+ keypair_name: wally_vm_key
+
+ 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: 100
+ ram_size: 1024
+ cpu_count: 2
+
+ vol_sz: 100
+ name_templ: wally-{group}-{id}
+ aa_group_name: wally-aa-{0}
+ security_group: wally_ssh_to_everyone
diff --git a/configs-examples/hdd.yaml b/configs-examples/hdd.yaml
index dcb5f9e..d38904a 100644
--- a/configs-examples/hdd.yaml
+++ b/configs-examples/hdd.yaml
@@ -1,17 +1,11 @@
+include: default.yaml
+
explicit_nodes:
local: testnode
-internal:
- var_dir_root: /tmp/perf_tests
-
-testnode_log_root: /tmp/perf_tests_rem
-
tests:
- io:
cfg: hdd
params:
- FILENAME: FILE_ON_USB_HDD
- NUM_ROUNDS: 7
-
-logging:
- extra_logs: 1
\ No newline at end of file
+ FILENAME: ${FILEPATH}
+ FILESIZE: ${FILESIZE}
diff --git a/configs-examples/local_ceph.yaml b/configs-examples/local_ceph.yaml
index 613894d..519f094 100644
--- a/configs-examples/local_ceph.yaml
+++ b/configs-examples/local_ceph.yaml
@@ -1,3 +1,5 @@
+include: default.yaml
+
clouds:
ceph: local
@@ -6,9 +8,6 @@
explicit_nodes:
local: testnode
-internal:
- var_dir_root: /tmp/perf_tests
-
sensors:
roles_mapping:
testnode: system-cpu, block-io
@@ -17,8 +16,5 @@
- io:
cfg: ceph
params:
- FILENAME: CEPH_RBD_DEVICE
- NUM_ROUNDS: 7
-
-logging:
- extra_logs: 1
+ FILENAME: ${CEPH_RBD_DEVICE}
+ FILESIZE: ${FILESIZE}