summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTodd Willey <todd@rubidine.com>2011-06-16 09:56:43 -0700
committerTodd Willey <todd@rubidine.com>2011-06-16 09:56:43 -0700
commit80407c4ca0ff031c5b6403bc841c904609afbc1d (patch)
treec18ac31fa90495dc4b334ba3cefa63b84fbe88f9
parent4cd2756b9888fb33532558533c3b45f771f4cafd (diff)
parent24a192cfca3003a8c5ced420c2932effbe783ccc (diff)
Merge pull request #38 from sleepsonthefloor/master
In sample data, need both nova and nova_compat (api versions 1.1 and 1.0)
-rwxr-xr-xbin/sampledata.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/bin/sampledata.sh b/bin/sampledata.sh
index 009beaa1..6f73e06c 100755
--- a/bin/sampledata.sh
+++ b/bin/sampledata.sh
@@ -39,7 +39,8 @@
#BaseURLs
./keystone-manage $* baseURLs add RegionOne swift http://swift.publicinternets.com/v1/AUTH_%tenant_id% http://swift.admin-nets.local:8080/ http://127.0.0.1:8080/v1/AUTH_%tenant_id% 1
-./keystone-manage $* baseURLs add RegionOne nova http://nova.publicinternets.com/v1.1/%tenant_id% http://127.0.0.1:8774/v1.1 http://localhost:8774/v1.0 1
+./keystone-manage $* baseURLs add RegionOne nova_compat http://nova.publicinternets.com/v1.0/ http://127.0.0.1:8774/v1.0 http://localhost:8774/v1.0 1
+./keystone-manage $* baseURLs add RegionOne nova http://nova.publicinternets.com/v1.1/ http://127.0.0.1:8774/v1.1 http://localhost:8774/v1.1 1
./keystone-manage $* baseURLs add RegionOne glance http://glance.publicinternets.com/v1.1/%tenant_id% http://nova.admin-nets.local/v1.1/%tenant_id% http://127.0.0.1:9292/v1.1/%tenant_id% 1
./keystone-manage $* baseURLs add RegionOne cdn http://cdn.publicinternets.com/v1.1/%tenant_id% http://cdn.admin-nets.local/v1.1/%tenant_id% http://127.0.0.1:7777/v1.1/%tenant_id% 1
./keystone-manage $* baseURLs add RegionOne keystone http://keystone.publicinternets.com/v2.0 http://127.0.0.1:8081/v2.0 http://127.0.0.1:8080/v2.0 1
@@ -66,3 +67,4 @@
./keystone-manage $* tenant_baseURL add 1234 3
./keystone-manage $* tenant_baseURL add 1234 4
./keystone-manage $* tenant_baseURL add 1234 5
+./keystone-manage $* tenant_baseURL add 1234 6