summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDolph Mathews <dolph.mathews@gmail.com>2011-10-20 13:22:13 -0500
committerDolph Mathews <dolph.mathews@gmail.com>2011-10-20 15:32:23 -0500
commit1a408bbcc52cf359167f5071f77b2c6afd1f7c72 (patch)
tree4f0b0ff899c07b182be1db47fa2b1b69549bfb28
parent4b30f08fdb1d5354747997bea1cd9558b1f4ca2e (diff)
Removed 'under construction' docs provided elsewhere
Change-Id: Ia1017cc4597220718741c3c3bcf518e9e71ab979
-rw-r--r--doc/source/gettingstarted.rst43
-rw-r--r--doc/source/groups.rst19
-rw-r--r--doc/source/index.rst24
-rw-r--r--doc/source/roles.rst19
-rw-r--r--doc/source/tenants.rst19
-rw-r--r--doc/source/users.rst19
6 files changed, 29 insertions, 114 deletions
diff --git a/doc/source/gettingstarted.rst b/doc/source/gettingstarted.rst
index fbdc8fd0..03e12a0d 100644
--- a/doc/source/gettingstarted.rst
+++ b/doc/source/gettingstarted.rst
@@ -19,47 +19,46 @@ Quick Guide to Getting Started with Keystone
Dependencies
----------------------------------
-First, you will need to install keystone, if you haven't done so already
-
+------------
+
+First, you will need to install keystone, if you haven't done so already.
+
.. toctree::
:maxdepth: 1
- installing
-
+ installing
+
+
Creating your first global admin
----------------------------------
+--------------------------------
Change driectory to your install path
-
-
+
Creating your first tenant admin
----------------------------------
-Change directory to your install path.
-
-
-1. Run the following to create the first tennant::
+--------------------------------
+
+Change directory to your install path.
+
+#. Run the following to create the first tennant::
$> bin/keystone-manage tenant add "MyTenant"
-2. Run the following to create the first tenant admin::
-
+#. Run the following to create the first tenant admin::
+
$> bin/keystone-manage user add MyAdmin P@ssw0rd MyTenant
-
+
.. note::
-
+
Some reserved roles are defined (and can be modified) through the keystone.conf in the /etc folder.
-3. Associate your tenant admin with the Admin role::
+#. Associate your tenant admin with the Admin role::
$> bin/keystone-manage role grant Admin MyAdmin
-
-
-
Curl examples
----------------------------------
+-------------
+
.. toctree::
:maxdepth: 1
diff --git a/doc/source/groups.rst b/doc/source/groups.rst
deleted file mode 100644
index 59703e05..00000000
--- a/doc/source/groups.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-..
- Copyright 2011 OpenStack, LLC
- All Rights Reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License"); you may
- not use this file except in compliance with the License. You may obtain
- a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- License for the specific language governing permissions and limitations
- under the License.
-
-Groups
-======
-
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 31d777ab..c5036632 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -14,22 +14,14 @@
License for the specific language governing permissions and limitations
under the License.
-Welcome to Keystone's documentation!
-====================================
+Keystone for Contributors
+=========================
-The Keystone project provides services for authenticating and managing
-user, account, and role information.
+Keystone is the cononical implementation of
+[Openstack's Identity API](https://github.com/openstack/identity-api), which
+includes authentication and (soon) authorization services.
-Concepts
-========
-
-.. toctree::
- :maxdepth: 1
-
- users
- tenants
- groups
- roles
+This document describes keystone for contributors of the project.
Using Keystone
==============
@@ -37,9 +29,9 @@ Using Keystone
.. toctree::
:maxdepth: 1
- installing
+ installing
gettingstarted
-
+
Developer Docs
==============
diff --git a/doc/source/roles.rst b/doc/source/roles.rst
deleted file mode 100644
index bc55a1d0..00000000
--- a/doc/source/roles.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-..
- Copyright 2011 OpenStack, LLC
- All Rights Reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License"); you may
- not use this file except in compliance with the License. You may obtain
- a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- License for the specific language governing permissions and limitations
- under the License.
-
-Roles
-=====
-
diff --git a/doc/source/tenants.rst b/doc/source/tenants.rst
deleted file mode 100644
index 2fdbf8b4..00000000
--- a/doc/source/tenants.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-..
- Copyright 2011 OpenStack, LLC
- All Rights Reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License"); you may
- not use this file except in compliance with the License. You may obtain
- a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- License for the specific language governing permissions and limitations
- under the License.
-
-Tenants
-=======
-
diff --git a/doc/source/users.rst b/doc/source/users.rst
deleted file mode 100644
index 44f43eaa..00000000
--- a/doc/source/users.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-..
- Copyright 2011 OpenStack, LLC
- All Rights Reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License"); you may
- not use this file except in compliance with the License. You may obtain
- a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- License for the specific language governing permissions and limitations
- under the License.
-
-Users
-=====
-