From 99a3ffc62afd681fa730d6cde26b6db67ec7aa01 Mon Sep 17 00:00:00 2001
From: Mark Maglana <mmaglana@gmail.com>
Date: Wed, 4 Sep 2013 14:59:53 -0700
Subject: [PATCH] Update configuration for travis-ci

---
 .travis.yml                    |  1 +
 test/environment.yml.travis-ci | 21 +++++++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 05c8c57..8fcc1d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: ruby
 rvm:
   - 1.9.3
+  - 2.0.0-p247
 branches:
   only:
     - master
diff --git a/test/environment.yml.travis-ci b/test/environment.yml.travis-ci
index 0bf92dd..99cc1e4 100644
--- a/test/environment.yml.travis-ci
+++ b/test/environment.yml.travis-ci
@@ -1,24 +1,29 @@
-openstack: &openstack
+common: &common
   provider:      openstack
   auth_service:
     name:        identity
-    host_uri:    http://example.org:5000
+    host_uri:    http://an.openstack.environment.com:5000
     request:     create_token
     validator:   list_tenants
     api_version: v2
   
-openstack_admin: &openstack_admin
-  <<: *openstack
+  
+# This is expected by the test suite. You may change its values freely
+# as long as the name 'openstack_admin' doesn't change and the user's
+# role in the tenant is that of 'admin'
+openstack_admin:
+  <<: *common
   auth_credentials:
     username:   admin
     password:   mypassword
     tenantName: admin
 
-openstack_member: &openstack_member
-  <<: *openstack
+# This is expected by the test suite. You may change its values freely
+# as long as the name 'openstack_member' doesn't change and the user's
+# role in the tenant is that of 'member'
+openstack_member:
+  <<: *common
   auth_credentials:
     username:   nonadmin
     password:   mypassword
     tenantName: nonadminproject
-
-test: *openstack_admin