From 4d313b72dde58289532d3dfba3be9b066a2e7759 Mon Sep 17 00:00:00 2001 From: Harry Rybacki Date: Sat, 31 Mar 2018 16:28:25 -0400 Subject: [PATCH] Update install guides - Ensure myproject and myuser are used throughout the guide consistently - Add note that connection's host in keystone.conf must be resolveable Change-Id: Icaaf6c1b7583ed75b7a6204d7fb1f3506e4e8937 --- doc/source/install/common/keystone-users.inc | 3 +++ doc/source/install/common/openrc.inc | 6 +++--- doc/source/install/keystone-install-rdo.rst | 4 ++++ doc/source/install/keystone-verify-obs.rst | 4 ++-- doc/source/install/keystone-verify-rdo.rst | 10 ++-------- doc/source/install/keystone-verify-ubuntu.rst | 10 ++-------- 6 files changed, 16 insertions(+), 21 deletions(-) diff --git a/doc/source/install/common/keystone-users.inc b/doc/source/install/common/keystone-users.inc index db761e632b..6c4deb4f17 100644 --- a/doc/source/install/common/keystone-users.inc +++ b/doc/source/install/common/keystone-users.inc @@ -21,6 +21,7 @@ projects, users, and roles. | enabled | True | | id | 2f4f80574fd84fe6ba9067228ae0a50c | | name | example | + | tags | [] | +-------------+----------------------------------+ .. end @@ -44,6 +45,7 @@ projects, users, and roles. | is_domain | False | | name | service | | parent_id | default | + | tags | [] | +-------------+----------------------------------+ .. end @@ -69,6 +71,7 @@ projects, users, and roles. | is_domain | False | | name | myproject | | parent_id | default | + | tags | [] | +-------------+----------------------------------+ .. end diff --git a/doc/source/install/common/openrc.inc b/doc/source/install/common/openrc.inc index fb0910a714..6efadc87bd 100644 --- a/doc/source/install/common/openrc.inc +++ b/doc/source/install/common/openrc.inc @@ -57,9 +57,9 @@ scripts to load appropriate credentials for client operations. export OS_PROJECT_DOMAIN_NAME=Default export OS_USER_DOMAIN_NAME=Default - export OS_PROJECT_NAME=demo - export OS_USERNAME=demo - export OS_PASSWORD=DEMO_PASS + export OS_PROJECT_NAME=myproject + export OS_USERNAME=myuser + export OS_PASSWORD=MYUSER_PASS export OS_AUTH_URL=http://controller:5000/v3 export OS_IDENTITY_API_VERSION=3 export OS_IMAGE_API_VERSION=2 diff --git a/doc/source/install/keystone-install-rdo.rst b/doc/source/install/keystone-install-rdo.rst index 44bb8586b2..f30d5a0281 100644 --- a/doc/source/install/keystone-install-rdo.rst +++ b/doc/source/install/keystone-install-rdo.rst @@ -80,6 +80,10 @@ Install and configure components Comment out or remove any other ``connection`` options in the ``[database]`` section. + .. note:: + + The host, ``controller`` in this example, must be resolvable. + * In the ``[token]`` section, configure the Fernet token provider: .. path /etc/keystone/keystone.conf diff --git a/doc/source/install/keystone-verify-obs.rst b/doc/source/install/keystone-verify-obs.rst index 515136f3e1..c957a78edf 100644 --- a/doc/source/install/keystone-verify-obs.rst +++ b/doc/source/install/keystone-verify-obs.rst @@ -43,13 +43,13 @@ services. This command uses the password for the ``admin`` user. -#. As the ``demo`` user, request an authentication token: +#. As the ``myuser`` user created in the previous section, request an authentication token: .. code-block:: console $ openstack --os-auth-url http://controller:5000/v3 \ --os-project-domain-name Default --os-user-domain-name Default \ - --os-project-name demo --os-username demo token issue + --os-project-name myproject --os-username myuser token issue Password: +------------+-----------------------------------------------------------------+ diff --git a/doc/source/install/keystone-verify-rdo.rst b/doc/source/install/keystone-verify-rdo.rst index 91a11a019b..9e8ec2b28d 100644 --- a/doc/source/install/keystone-verify-rdo.rst +++ b/doc/source/install/keystone-verify-rdo.rst @@ -43,13 +43,13 @@ services. This command uses the password for the ``admin`` user. -#. As the ``demo`` user, request an authentication token: +#. As the ``myuser`` user created in the previous section, request an authentication token: .. code-block:: console $ openstack --os-auth-url http://controller:5000/v3 \ --os-project-domain-name Default --os-user-domain-name Default \ - --os-project-name demo --os-username demo token issue + --os-project-name myproject --os-username myuser token issue Password: +------------+-----------------------------------------------------------------+ @@ -64,9 +64,3 @@ services. +------------+-----------------------------------------------------------------+ .. end - - .. note:: - - This command uses the password for the ``demo`` - user and API port 5000 which only allows regular (non-admin) - access to the Identity service API. diff --git a/doc/source/install/keystone-verify-ubuntu.rst b/doc/source/install/keystone-verify-ubuntu.rst index f92548b110..77ef15e4a4 100644 --- a/doc/source/install/keystone-verify-ubuntu.rst +++ b/doc/source/install/keystone-verify-ubuntu.rst @@ -43,13 +43,13 @@ services. This command uses the password for the ``admin`` user. -#. As the ``demo`` user, request an authentication token: +#. As the ``myuser`` user created in the previous, request an authentication token: .. code-block:: console $ openstack --os-auth-url http://controller:5000/v3 \ --os-project-domain-name Default --os-user-domain-name Default \ - --os-project-name demo --os-username demo token issue + --os-project-name myproject --os-username myuser token issue Password: +------------+-----------------------------------------------------------------+ @@ -64,9 +64,3 @@ services. +------------+-----------------------------------------------------------------+ .. end - - .. note:: - - This command uses the password for the ``demo`` - user and API port 5000 which only allows regular (non-admin) - access to the Identity service API.