diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2012-03-09 11:05:13 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2012-03-09 11:23:33 +0000 |
| commit | 5aef0e13411fb8ce4e396b9addf65ef5a9ba28a2 (patch) | |
| tree | 1972d4f62b4b3986af0e024a3aea4c92c2163b0b /nova/auth | |
| parent | 17396f6a08b694b28538462baca582266152da86 (diff) | |
Add pybasedir and bindir options
Add a pybasedir option so that it can be used for interpolation in the
default values of other options. This helps eliminate hard-coded paths
from the sample config file.
Also add a bindir option for similar reasons, but it also helps with
packaging.
Change-Id: Iadc746dcf2a24adbdf9bac945b5b330f01faeeb5
Diffstat (limited to 'nova/auth')
| -rw-r--r-- | nova/auth/manager.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/auth/manager.py b/nova/auth/manager.py index 438066e3b..ca2a3add5 100644 --- a/nova/auth/manager.py +++ b/nova/auth/manager.py @@ -63,10 +63,10 @@ auth_opts = [ help='Roles that apply to all projects'), cfg.StrOpt('credentials_template', - default=utils.abspath('auth/novarc.template'), + default='$pybasedir/nova/auth/novarc.template', help='Template for creating users rc file'), cfg.StrOpt('vpn_client_template', - default=utils.abspath('cloudpipe/client.ovpn.template'), + default='$pybasedir/nova/cloudpipe/client.ovpn.template', help='Template for creating users vpn file'), cfg.StrOpt('credential_vpn_file', default='nova-vpn.conf', |