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
diff --git a/include/sample_vm/README.txt b/include/sample_vm/README.txt
index e8895ea..51b609d 100644
--- a/include/sample_vm/README.txt
+++ b/include/sample_vm/README.txt
@@ -2,5 +2,5 @@
 Will also need to update the tests to reference this new image.
 
 You could use e.g. the Ubuntu Natty cloud images (this matches the sample configuration):
-$ wget http://cloud-images.ubuntu.com/releases/natty/release/ubuntu-11.04-server-uec-amd64.tar.gz
-$ tar xvzf ubuntu-11.04-server-uec-amd64.tar.gz
+$ wget http://cloud-images.ubuntu.com/releases/natty/release/ubuntu-11.04-server-cloudimg-amd64.tar.gz
+$ tar xvzf ubuntu-11.04-server-cloudimg-amd64.tar.gz