diff --git a/doc/samples/deployments/devstack-in-lxc.json b/doc/samples/deployments/devstack-in-lxc.json index cc4fa8e951..077f941c51 100644 --- a/doc/samples/deployments/devstack-in-lxc.json +++ b/doc/samples/deployments/devstack-in-lxc.json @@ -1,23 +1,17 @@ { - "deploy": { - "name": "DevstackEngine", - "localrc": { - "VIRT_DRIVER": "fake" - }, - "provider": { - "name": "LxcProvider", - "containers_per_host": 1, - "distribution": "ubuntu", - "ipv4_start_address": "10.2.232.1", - "ipv4_prefixlen": 16, - "host_provider": { - "name": "DummyProvider", - "credentials": ["root@10.2.250.103"] - } - } + "name": "DevstackEngine", + "localrc": { + "VIRT_DRIVER": "fake" }, - "tests": { - "verify": [], - "benchmark": {} + "provider": { + "name": "LxcProvider", + "containers_per_host": 1, + "distribution": "ubuntu", + "ipv4_start_address": "10.2.232.1", + "ipv4_prefixlen": 16, + "host_provider": { + "name": "DummyProvider", + "credentials": ["root@10.2.250.103"] + } } } diff --git a/doc/samples/deployments/devstack-in-openstack.json b/doc/samples/deployments/devstack-in-openstack.json index 74a5e606cb..19f9f2ea17 100644 --- a/doc/samples/deployments/devstack-in-openstack.json +++ b/doc/samples/deployments/devstack-in-openstack.json @@ -1,25 +1,20 @@ { - "deploy": { - "name": "DevstackEngine", - "provider": { - "name": "OpenStackProvider", - "user": "admin", - "tenant": "admin", - "flavor_id": "2", - "password": "admin", - "auth_url": "http://example.net:5000/v2.0", - "amount": 1, - "image": { - "checksum": "5101b2013b31d9f2f96f64f728926054", - "name": "Ubuntu raring(added by rally)", - "format": "qcow2", - "userdata": "#cloud-config\r\n disable_root: false\r\n manage_etc_hosts: true\r\n", - "url": "http://cloud-images.ubuntu.com/raring/current/raring-server-cloudimg-amd64-disk1.img" - } + "name": "DevstackEngine", + "provider": { + "name": "OpenStackProvider", + "deployment_name": "Rally sample deployment", + "user": "admin", + "tenant": "admin", + "flavor_id": "2", + "password": "admin", + "auth_url": "http://example.net:5000/v2.0", + "amount": 1, + "image": { + "checksum": "5101b2013b31d9f2f96f64f728926054", + "name": "Ubuntu raring(added by rally)", + "format": "qcow2", + "userdata": "#cloud-config\r\n disable_root: false\r\n manage_etc_hosts: true\r\n", + "url": "http://cloud-images.ubuntu.com/raring/current/raring-server-cloudimg-amd64-disk1.img" } - }, - "tests": { - "verify": ["sanity", "smoke"], - "benchmark": {} } }