diff options
Diffstat (limited to 'integration/scripts/conf/test_begin.conf')
| -rw-r--r-- | integration/scripts/conf/test_begin.conf | 66 |
1 files changed, 27 insertions, 39 deletions
diff --git a/integration/scripts/conf/test_begin.conf b/integration/scripts/conf/test_begin.conf index 4d9b92ba..fa0a1e1f 100644 --- a/integration/scripts/conf/test_begin.conf +++ b/integration/scripts/conf/test_begin.conf @@ -4,46 +4,8 @@ "trove_auth_url":"http://%service_host%/identity/v3/auth/tokens", "trove_client_insecure":false, "auth_strategy":null, + "auth_url": "http://%service_host%/identity/v3", "trove_client_region_name": "%region_name%", - - "nova_client": { - "url":"http://%service_host%:8774/v1.1", - "auth_url":"http://%service_host%/identity/v3", - "nova_service_type":"compute", - "volume_service_type":"volume" - }, - - "glance_client": { - "auth_url":"http://%service_host%/identity/v3" - }, - - "flavors": null, - - "white_box":false, - "start_services": %startservices%, - "test_mgmt":false, - "use_local_ovz":false, - "use_venv":false, - "glance_code_root":"%glance_path%", - "glance_api_conf":"/vagrant/conf/glance-api.conf", - "glance_reg_conf":"/vagrant/conf/glance-reg.conf", - "glance_images_directory": "/glance_images", - "glance_image": "debian-squeeze-x86_64-openvz.tar.gz", - "report_directory":"%report_directory%", - "usr_bin_dir":"%bin_path%", - "nova_code_root":"%nova_path%", - "nova_conf":"/home/vagrant/nova.conf", - "keystone_code_root":"%keystone_path%", - "keystone_conf":"/etc/keystone/keystone.conf", - "keystone_use_combined":true, - "trove_code_root":"%trove_path%", - "trove_conf":"/tmp/trove.conf", - "trove_version":"v1.0", - "trove_api_updated":"2012-08-01T00:00:00Z", - "trove_max_accepted_volume_size": 1000, - "trove_max_instances_per_user": 55, - "trove_max_volumes_per_user": 100, - "use_reaper":false, "users": [ { "auth_user":"trove", "auth_key":"%service_password%", @@ -73,6 +35,32 @@ } } ], + "flavors": null, + "white_box":false, + "start_services": %startservices%, + "test_mgmt":false, + "use_local_ovz":false, + "use_venv":false, + "glance_code_root":"%glance_path%", + "glance_api_conf":"/vagrant/conf/glance-api.conf", + "glance_reg_conf":"/vagrant/conf/glance-reg.conf", + "glance_images_directory": "/glance_images", + "glance_image": "debian-squeeze-x86_64-openvz.tar.gz", + "report_directory":"%report_directory%", + "usr_bin_dir":"%bin_path%", + "nova_code_root":"%nova_path%", + "nova_conf":"/home/vagrant/nova.conf", + "keystone_code_root":"%keystone_path%", + "keystone_conf":"/etc/keystone/keystone.conf", + "keystone_use_combined":true, + "trove_code_root":"%trove_path%", + "trove_conf":"/tmp/trove.conf", + "trove_version":"v1.0", + "trove_api_updated":"2012-08-01T00:00:00Z", + "trove_max_accepted_volume_size": 1000, + "trove_max_instances_per_user": 55, + "trove_max_volumes_per_user": 100, + "use_reaper":false, "root_removed_from_instance_api": true, "root_timestamp_disabled": false, "openvz_disabled": true, |