merged trunk

1 files changed, 9 insertions, 9 deletions

diff --git a/nova/crypto.py b/nova/crypto.py
index a438d232b..dcc735c05 100644
--- a/nova/crypto.py
+++ b/nova/crypto.py
@@ -15,10 +15,10 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-
 """
-Wrappers around standard crypto, including root and project CAs,
-SSH key_pairs and x509 certificates.
+Wrappers around standard crypto data elements.
+
+Includes root and intermediate CAs, SSH key_pairs and x509 certificates.
 """
 
 import base64
@@ -45,9 +45,9 @@ flags.DEFINE_string('key_file',
                     'Filename of private key')
 flags.DEFINE_string('crl_file', 'crl.pem',
                     'Filename of root Certificate Revokation List')
-flags.DEFINE_string('keys_path', utils.abspath('../keys'),
+flags.DEFINE_string('keys_path', '$state_path/keys',
                     'Where we keep our keys')
-flags.DEFINE_string('ca_path', utils.abspath('../CA'),
+flags.DEFINE_string('ca_path', '$state_path/CA',
                     'Where we keep our root CA')
 flags.DEFINE_boolean('use_project_ca', False,
                      'Should we use a CA for each project?')
@@ -335,12 +335,12 @@ def mkcacert(subject='nova', years=1):
 
 def compute_md5(fp):
     """
-    @type fp: file
-    @param fp: File pointer to the file to MD5 hash.  The file pointer will be
+    :type fp: file
+    :param fp: File pointer to the file to MD5 hash.  The file pointer will be
                reset to the beginning of the file before the method returns.
 
-    @rtype: tuple
-    @return: the hex digest version of the MD5 hash
+    :rtype: tuple
+    :return: the hex digest version of the MD5 hash
     """
     m = hashlib.md5()
     fp.seek(0)