commit bbb1cfb37739abca39018573d9e093dbe54b4471
author Brian Waldon <brian.waldon@rackspace.com> Thu Oct 27 18:04:37 2011 -0400
committer Brian Waldon <brian.waldon@rackspace.com> Mon Oct 31 15:23:19 2011 -0400
tree e9a2dcfb304d8ad96d83df441a397b6af6d90e11
parent c062b440003b330c63ee6917e7182cc5a937d0ff

Updating images tests

- Consolidating glance/images test modules.
- Consolidating all glance tests into a single ami-specific test
- Test now cleans up images it pushes into glance
- Updating links for sample ami-style image
- Updating config variables for ami-style image pieces

Change-Id: Ie0aaec36eca8425b687740b289fce6964b13fdbd

etc/config.ini.sample

diff --git a/etc/config.ini.sample b/etc/config.ini.sample
index c27bb04..c0d9fea 100644
--- a/etc/config.ini.sample
+++ b/etc/config.ini.sample
@@ -1,7 +1,7 @@
 [environment]
-kernel = include/sample_vm/natty-server-uec-amd64-vmlinuz-virtual
-#initrd = include/sample_vm/natty-server-uec-amd64-initrd-virtual
-image = include/sample_vm/natty-server-uec-amd64.img
+aki_location = include/sample_vm/natty-server-cloudimg-amd64-vmlinuz-virtual
+#ari_location = include/sample_vm/natty-server-cloudimg-amd64-loader
+ami_location = include/sample_vm/natty-server-cloudimg-amd64.img
 
 [swift]
 auth_host = 10.0.0.100