diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-08-13 18:25:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-08-13 18:25:41 +0000 |
| commit | ce6c35e55c2e722184d052f0c95a7bb8a9a5b606 (patch) | |
| tree | f8e9701f8c8edfc5d18fe39a85ae4d2819a4016e | |
| parent | 885d4b6ddaa52923a4f60644fd4cd675eeb42b3b (diff) | |
| parent | 7d022b4651f948144b6116b66b260e9bbb251dec (diff) | |
| download | trove-ce6c35e55c2e722184d052f0c95a7bb8a9a5b606.tar.gz | |
Merge "Moves extension files to routes"
| -rw-r--r-- | etc/trove/trove-guestagent.conf.sample | 2 | ||||
| -rw-r--r-- | etc/trove/trove.conf.sample | 2 | ||||
| -rw-r--r-- | etc/trove/trove.conf.test | 2 | ||||
| -rw-r--r-- | trove/extensions/routes/account.py (renamed from trove/extensions/account.py) | 0 | ||||
| -rw-r--r-- | trove/extensions/routes/mgmt.py (renamed from trove/extensions/mgmt.py) | 0 | ||||
| -rw-r--r-- | trove/extensions/routes/mysql.py (renamed from trove/extensions/mysql.py) | 0 | ||||
| -rw-r--r-- | trove/extensions/routes/security_group.py (renamed from trove/extensions/security_group.py) | 0 |
7 files changed, 3 insertions, 3 deletions
diff --git a/etc/trove/trove-guestagent.conf.sample b/etc/trove/trove-guestagent.conf.sample index 5e9cd755..66dc5933 100644 --- a/etc/trove/trove-guestagent.conf.sample +++ b/etc/trove/trove-guestagent.conf.sample @@ -34,7 +34,7 @@ sql_idle_timeout = 3600 db_api_implementation = "trove.db.sqlalchemy.api" # Path to the extensions -api_extensions_path = trove/extensions +api_extensions_path = trove/extensions/routes # Configuration options for talking to nova via the novaclient. # These options are for an admin user in your keystone config. diff --git a/etc/trove/trove.conf.sample b/etc/trove/trove.conf.sample index 768c3293..ad24d5e5 100644 --- a/etc/trove/trove.conf.sample +++ b/etc/trove/trove.conf.sample @@ -37,7 +37,7 @@ sql_idle_timeout = 3600 db_api_implementation = "trove.db.sqlalchemy.api" # Path to the extensions -api_extensions_path = trove/extensions +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 diff --git a/etc/trove/trove.conf.test b/etc/trove/trove.conf.test index 283391e9..ec2fe74c 100644 --- a/etc/trove/trove.conf.test +++ b/etc/trove/trove.conf.test @@ -52,7 +52,7 @@ sql_idle_timeout = 3600 db_api_implementation = trove.db.sqlalchemy.api # Path to the extensions -api_extensions_path = trove/extensions +api_extensions_path = trove/extensions/routes # Configuration options for talking to nova via the novaclient. # These options are for an admin user in your keystone config. diff --git a/trove/extensions/account.py b/trove/extensions/routes/account.py index 784db481..784db481 100644 --- a/trove/extensions/account.py +++ b/trove/extensions/routes/account.py diff --git a/trove/extensions/mgmt.py b/trove/extensions/routes/mgmt.py index f46b9ec2..f46b9ec2 100644 --- a/trove/extensions/mgmt.py +++ b/trove/extensions/routes/mgmt.py diff --git a/trove/extensions/mysql.py b/trove/extensions/routes/mysql.py index a40daefd..a40daefd 100644 --- a/trove/extensions/mysql.py +++ b/trove/extensions/routes/mysql.py diff --git a/trove/extensions/security_group.py b/trove/extensions/routes/security_group.py index c943bbc8..c943bbc8 100644 --- a/trove/extensions/security_group.py +++ b/trove/extensions/routes/security_group.py |