diff options
| author | Ziad Sawalha <github@highbridgellc.com> | 2011-06-14 11:21:01 -0500 |
|---|---|---|
| committer | Ziad Sawalha <github@highbridgellc.com> | 2011-06-14 11:21:01 -0500 |
| commit | d7aed2064de3ee39c8a3a05c4e73ba5b18fac9f9 (patch) | |
| tree | de74dc77b74d93944764861847c6433ce6bbf299 | |
| parent | f5bde61b016d398478899fe3560c358648cd2220 (diff) | |
| download | keystone-d7aed2064de3ee39c8a3a05c4e73ba5b18fac9f9.tar.gz keystone-d7aed2064de3ee39c8a3a05c4e73ba5b18fac9f9.tar.xz keystone-d7aed2064de3ee39c8a3a05c4e73ba5b18fac9f9.zip | |
Changed BaseURLs to OpenStack names
| -rwxr-xr-x | bin/sampledata.sh | 5 | ||||
| -rwxr-xr-x | etc/keystone.conf | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/bin/sampledata.sh b/bin/sampledata.sh index 46135dd2..2309aecc 100755 --- a/bin/sampledata.sh +++ b/bin/sampledata.sh @@ -38,9 +38,8 @@ ./keystone-manage $* role grant Admin joeadmin ANOTHER:TENANT #BaseURLs -./keystone-manage $* baseURLs add DFW cloudFiles http://127.0.0.1:8888/v1/AUTH_%tenant_id% admin.cloudfiles.com internal.cloudfiles.com 1 -./keystone-manage $* baseURLs add DFW cloudFilesCDN https://storage.clouddrive.com/v1/%tenant_id% https://storage.clouddrive.com/v1/%tenant_id% https://storage.clouddrive.com/v1/%tenant_id% 1 -./keystone-manage $* baseURLs add DFW cloudServers http://localhost:8008/v1.0/%tenant_id% https://servers.api.rackspacecloud.com/v1.0/%tenant_id% https://servers.api.rackspacecloud.com/v1.0/%tenant_id% 1 +./keystone-manage $* baseURLs add ZONE1 swift http://localhost:8888/v1/AUTH_%tenant_id% admin.swift.local internal.swift.local 1 +./keystone-manage $* baseURLs add ZONE1 nova http://localhost:8008/v1.1/%tenant_id% https://api.openstack.local/v1.1/%tenant_id% https://api.openstack.local/v1.1/%tenant_id% 1 # Groups #./keystone-manage $* group add Admin 1234 diff --git a/etc/keystone.conf b/etc/keystone.conf index 7da598fc..259e3ef3 100755 --- a/etc/keystone.conf +++ b/etc/keystone.conf @@ -27,7 +27,7 @@ sql_connection = sqlite:///../keystone/keystone.db sql_idle_timeout = 30 #Dictionary Maps every service to a header.Missing services would get header X_(SERVICE_NAME) Key => Service Name, Value => Header Name -service-header-mappings = {'cloudServers' : 'X-Server-Management-Url' , 'cloudFiles' : 'X-Storage-Url', 'cloudFilesCDN' : 'X-CDN-Management-Url'} +service-header-mappings = {'nova' : 'X-Server-Management-Url' , 'swift' : 'X-Storage-Url', 'CDN' : 'X-CDN-Management-Url'} # Address to bind the API server #TODO Properties defined within app not available via pipeline.Till then server props stay outside. |