Fix URLs to admin-guide-cloud

The content of the admin-guide-cloud has been changed and thus URLs are
moved. Replace outdated URLs with current ones.

The reorg of admin-guide-cloud was done as part of
http://specs.openstack.org/openstack/docs-specs/specs/liberty/reorganise-user-guides.html.

Implements blueprint reorganise-user-guides

Change-Id: I6f980021824e57df973e62d6023b27feb0fa703b

diff --git a/cinder/volume/drivers/nfs.py b/cinder/volume/drivers/nfs.py
index a9395057d2e34844413facecbb7ef0bee16f400a..78c178434984c3a389b81b4872a1bcd406e96982 100644 (file)
--- a/cinder/volume/drivers/nfs.py
+++ b/cinder/volume/drivers/nfs.py
@@ -323,8 +323,8 @@ class NfsDriver(driver.ExtendVD, remotefs.RemoteFSDriver):
 
         :param is_new_cinder_install: bool indication of new Cinder install
         """
-        doc_html = "http://docs.openstack.org/admin-guide-cloud/content" \
-                   "/nfs_backend.html"
+        doc_html = "http://docs.openstack.org/admin-guide-cloud" \
+                   "/blockstorage_nfs_backend.html"
 
         self._ensure_shares_mounted()
         if not self._mounted_shares:

diff --git a/cinder/volume/drivers/remotefs.py b/cinder/volume/drivers/remotefs.py
index fb7ffd5b739c468e34af63edb9f339aed2719710..1fa8f0ccb3d5b12f5c0847dde34c3aad408e0674 100644 (file)
--- a/cinder/volume/drivers/remotefs.py
+++ b/cinder/volume/drivers/remotefs.py
@@ -558,8 +558,8 @@ class RemoteFSDriver(driver.LocalVD, driver.TransferVD, driver.BaseVD):
         NAS file operations. This base method will set the NAS security
         options to false.
         """
-        doc_html = "http://docs.openstack.org/admin-guide-cloud/content" \
-                   "/nfs_backend.html"
+        doc_html = "http://docs.openstack.org/admin-guide-cloud" \
+                   "/blockstorage_nfs_backend.html"
         self.configuration.nas_secure_file_operations = 'false'
         LOG.warning(_LW("The NAS file operations will be run as root: "
                         "allowing root level access at the storage backend. "