summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAuston McReynolds <amcreynolds@ebaysf.com>2013-08-28 19:36:36 -0700
committerAuston McReynolds <amcreynolds@ebaysf.com>2013-08-28 19:49:09 -0700
commit0815de500bb76d4877d2392d027da3867ef1fff0 (patch)
treea9291e9a0b7f44f68225fc87a68fe7813f7111d0
parent2538755e9b1aca9ad82e38e08b47fffcf91586bd (diff)
downloadtrove-0815de500bb76d4877d2392d027da3867ef1fff0.tar.gz
Update nova_volume_url to cinder_url in CONF files
"Replace nova client with cinder client to use volume" for bp/implement-volume-extend replaced nova_volume_url with cinder_url. The purpose of the change was to support Cinder's recently acquired ability to extend volumes. The original changeset missed the CONF files, leaving the nova_volume_url artifact. Change-Id: Ic814d8cef424c4d1e18e531beb9302da9e273eb6 Closes-Bug: #1218152
-rw-r--r--etc/trove/trove-taskmanager.conf.sample2
-rw-r--r--etc/trove/trove.conf.sample2
2 files changed, 2 insertions, 2 deletions
diff --git a/etc/trove/trove-taskmanager.conf.sample b/etc/trove/trove-taskmanager.conf.sample
index 082b2809..f299fade 100644
--- a/etc/trove/trove-taskmanager.conf.sample
+++ b/etc/trove/trove-taskmanager.conf.sample
@@ -29,7 +29,7 @@ db_api_implementation = trove.db.sqlalchemy.api
# Configuration options for talking to nova via the novaclient.
trove_auth_url = http://0.0.0.0:5000/v2.0
nova_compute_url = http://localhost:8774/v2
-nova_volume_url = http://localhost:8776/v1
+cinder_url = http://localhost:8776/v1
swift_url = http://localhost:8080/v1/AUTH_
# Config options for enabling volume service
diff --git a/etc/trove/trove.conf.sample b/etc/trove/trove.conf.sample
index ad24d5e5..107209a3 100644
--- a/etc/trove/trove.conf.sample
+++ b/etc/trove/trove.conf.sample
@@ -42,7 +42,7 @@ api_extensions_path = trove/extensions/routes
# Configuration options for talking to nova via the novaclient.
trove_auth_url = http://0.0.0.0:5000/v2.0
nova_compute_url = http://localhost:8774/v2
-nova_volume_url = http://localhost:8776/v1
+cinder_url = http://localhost:8776/v1
swift_url = http://localhost:8080/v1/AUTH_
# Config option for showing the IP address that nova doles out