From 8ff5c131f8966c9473399dae75c189f3768bc242 Mon Sep 17 00:00:00 2001 From: Juanita-Balaraj Date: Wed, 20 Oct 2021 16:30:42 -0400 Subject: [PATCH] Updated references in "Manage Keystone Accounts" To be cherry picked to stx 5.0 Added references in additional topics Updated review comments Signed-off-by: Juanita-Balaraj Change-Id: I9bb9ad3d51938c6714320371e506eecb3e1232e1 Signed-off-by: Juanita-Balaraj --- .../dm-credentials-on-keystone-pwds.rest | 1 + .../_includes/manage-keystone-accounts.rest | 0 ...he-admin-password-on-distributed-cloud.rst | 2 ++ .../kubernetes/rehoming-a-subcloud.rst | 3 +++ .../kubernetes/about-keystone-accounts.rst | 2 +- .../kubernetes/manage-keystone-accounts.rst | 20 ++++++++++++++----- .../security/kubernetes/password-recovery.rst | 2 ++ 7 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 doc/source/_includes/dm-credentials-on-keystone-pwds.rest delete mode 100644 doc/source/_includes/manage-keystone-accounts.rest diff --git a/doc/source/_includes/dm-credentials-on-keystone-pwds.rest b/doc/source/_includes/dm-credentials-on-keystone-pwds.rest new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/doc/source/_includes/dm-credentials-on-keystone-pwds.rest @@ -0,0 +1 @@ + diff --git a/doc/source/_includes/manage-keystone-accounts.rest b/doc/source/_includes/manage-keystone-accounts.rest deleted file mode 100644 index e69de29bb..000000000 diff --git a/doc/source/dist_cloud/kubernetes/changing-the-admin-password-on-distributed-cloud.rst b/doc/source/dist_cloud/kubernetes/changing-the-admin-password-on-distributed-cloud.rst index 546eeb219..84e0385bf 100644 --- a/doc/source/dist_cloud/kubernetes/changing-the-admin-password-on-distributed-cloud.rst +++ b/doc/source/dist_cloud/kubernetes/changing-the-admin-password-on-distributed-cloud.rst @@ -56,4 +56,6 @@ Ensure that all subclouds are managed and online. command :command:`keyring set CGCS admin` and provide the new admin password. +.. only:: partner + .. include:: /_includes/dm-credentials-on-keystone-pwds.rest diff --git a/doc/source/dist_cloud/kubernetes/rehoming-a-subcloud.rst b/doc/source/dist_cloud/kubernetes/rehoming-a-subcloud.rst index 6507dbfcb..5188f43fb 100644 --- a/doc/source/dist_cloud/kubernetes/rehoming-a-subcloud.rst +++ b/doc/source/dist_cloud/kubernetes/rehoming-a-subcloud.rst @@ -245,3 +245,6 @@ If all attempts fail, restore the subcloud from backups, that will revert the subcloud to the original state prior to rehoming. +.. only:: partner + + .. include:: /_includes/dm-credentials-on-keystone-pwds.rest \ No newline at end of file diff --git a/doc/source/security/kubernetes/about-keystone-accounts.rst b/doc/source/security/kubernetes/about-keystone-accounts.rst index adc82f45b..ba2a14278 100644 --- a/doc/source/security/kubernetes/about-keystone-accounts.rst +++ b/doc/source/security/kubernetes/about-keystone-accounts.rst @@ -7,7 +7,7 @@ Keystone Accounts ================= |prod| uses tenant accounts and user accounts to identify and manage access to -StarlingX resources, and images in the Local Docker Registry. +|prod| resources, and images in the Local Docker Registry. You can create and manage Keystone projects and users from the web management interface, the CLI, or the |prod|'s Keystone REST API. diff --git a/doc/source/security/kubernetes/manage-keystone-accounts.rst b/doc/source/security/kubernetes/manage-keystone-accounts.rst index 248cc295d..b9b3ae184 100644 --- a/doc/source/security/kubernetes/manage-keystone-accounts.rst +++ b/doc/source/security/kubernetes/manage-keystone-accounts.rst @@ -6,16 +6,26 @@ Manage Keystone Accounts ======================== -See +You can create and manage Keystone projects and users from the web management +interface, the CLI, or the |prod|'s Keystone REST API. + +See: + `https://docs.openstack.org/keystone/pike/admin/cli-manage-projects-users-and-roles.html `_ for details on managing Keystone projects, users, and roles. +:ref:`Password Recovery ` for details on how to change or +reset a Keystone user password. -All Kubernetes accounts are subject to system password rules. For complete -details on password rules, see :ref:`System Account Password Rules -`. +:ref:`System Account Password Rules ` +for details on password rules, as all Kubernetes accounts are subject to system +password rules. + +:ref:`Change the Admin Password on Distributed Cloud ` +for details on changing the keystone admin user password across the entire +|prod-dc| system. .. only:: partner - .. include:: /_includes/manage-keystone-accounts.rest \ No newline at end of file + .. include:: /_includes/dm-credentials-on-keystone-pwds.rest \ No newline at end of file diff --git a/doc/source/security/kubernetes/password-recovery.rst b/doc/source/security/kubernetes/password-recovery.rst index 98dd674cd..db2bbe78a 100644 --- a/doc/source/security/kubernetes/password-recovery.rst +++ b/doc/source/security/kubernetes/password-recovery.rst @@ -38,4 +38,6 @@ This section describes how to change or reset a Keystone user password. where is the username and is a temporary password. +.. only:: partner + .. include:: /_includes/dm-credentials-on-keystone-pwds.rest