diff --git a/doc/source/_extra/.htaccess b/doc/source/_extra/.htaccess index 1332e6bba23a..0d6ca883d2a0 100644 --- a/doc/source/_extra/.htaccess +++ b/doc/source/_extra/.htaccess @@ -77,3 +77,4 @@ redirectmatch 301 ^/nova/([^/]+)/wsgi.html$ /nova/$1/user/wsgi.html redirectmatch 301 ^/nova/([^/]+)/admin/adv-config.html$ /nova/$1/admin/index.html redirectmatch 301 ^/nova/([^/]+)/admin/system-admin.html$ /nova/$1/admin/index.html redirectmatch 301 ^/nova/([^/]+)/admin/port_with_resource_request.html$ /nova/$1/admin/ports-with-resource-requests.html +redirectmatch 301 ^/nova/([^/]+)/admin/manage-users.html$ /nova/$1/admin/arch.html diff --git a/doc/source/admin/arch.rst b/doc/source/admin/arch.rst index 302e6f42b7d9..2590b497f0ee 100644 --- a/doc/source/admin/arch.rst +++ b/doc/source/admin/arch.rst @@ -83,6 +83,9 @@ section in the Nova Configuration Reference. Projects, users, and roles ~~~~~~~~~~~~~~~~~~~~~~~~~~ +To begin using Compute, you must create a user with the +:keystone-doc:`Identity service <>`. + The Compute system is designed to be used by different consumers in the form of projects on a shared system, and role-based access assignments. Roles control the actions that a user is allowed to perform. diff --git a/doc/source/admin/index.rst b/doc/source/admin/index.rst index bf0c85726327..374f72419b2b 100644 --- a/doc/source/admin/index.rst +++ b/doc/source/admin/index.rst @@ -78,7 +78,6 @@ responsibilities of services and drivers are: .. toctree:: :maxdepth: 2 - manage-users manage-volumes flavors default-ports diff --git a/doc/source/admin/manage-users.rst b/doc/source/admin/manage-users.rst deleted file mode 100644 index 41a925ff76fe..000000000000 --- a/doc/source/admin/manage-users.rst +++ /dev/null @@ -1,12 +0,0 @@ -.. _section_manage-compute-users: - -==================== -Manage Compute users -==================== - -Access to the Euca2ools (ec2) API is controlled by an access key and a secret -key. The user's access key needs to be included in the request, and the request -must be signed with the secret key. Upon receipt of API requests, Compute -verifies the signature and runs commands on behalf of the user. - -To begin using Compute, you must create a user with the Identity service. diff --git a/doc/test/redirect-tests.txt b/doc/test/redirect-tests.txt index 5a78be5289cc..093b3e2f4422 100644 --- a/doc/test/redirect-tests.txt +++ b/doc/test/redirect-tests.txt @@ -77,3 +77,4 @@ /nova/latest/admin/adv-config.html 301 /nova/latest/admin/index.html /nova/latest/admin/system-admin.html 301 /nova/latest/admin/index.html /nova/latest/admin/port_with_resource_request.html 301 /nova/latest/admin/ports-with-resource-requests.html +/nova/latest/admin/manage-users.html 301 /nova/latest/admin/arch.html