From 563fb3886d3edbc6026583e7cb485b48b1792156 Mon Sep 17 00:00:00 2001 From: Sharpz7 Date: Mon, 12 Feb 2024 20:07:27 +0000 Subject: [PATCH] [devstack-RBAC] - Edit docs to reflect RBAC changes. This is the first of potentially many commits to update away from openrc auth towards RBAC auth in devstack. This commit focusses on the documentaition changes only, with future commits dealing with shell script changes and anything else that needs to change. Change-Id: Ibb13993a0fd251f8948c7a813ed67cae701dab01 --- doc/source/contributor/devstack-guide.rst | 13 +++++++------ doc/source/contributor/ironic-boot-from-volume.rst | 4 +++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/doc/source/contributor/devstack-guide.rst b/doc/source/contributor/devstack-guide.rst index c67c150dd1..dc63ef6447 100644 --- a/doc/source/contributor/devstack-guide.rst +++ b/doc/source/contributor/devstack-guide.rst @@ -278,7 +278,7 @@ deploy, we need to determine what image to use, and what network to use. Determine the network:: - net_id=$(openstack network list | egrep "$PRIVATE_NETWORK_NAME"'[^-]' | awk '{ print $2 }') + net_id=$(openstack network list | awk '/private/ {print $2}') We also need to choose an image to deploy. Devstack has both cirros partition @@ -287,10 +287,10 @@ image:: image=$(openstack image list | grep -- '-disk' | awk '{ print $2 }') -Source credentials and create a key, and spawn an instance as the ``demo`` -user:: +Source credentials and create a key, and set the user to the admin demo (Note +that all the user options can be seen in `/etc/openstack/clouds.yaml`):: - . ~/devstack/openrc demo + export OS_CLOUD=devstack-admin-demo # create keypair ssh-keygen @@ -317,7 +317,8 @@ Nova will be interfacing with Ironic conductor to spawn the node. On the Ironic side, you should see an Ironic node associated with this Nova instance. It should be powered on and in a 'wait call-back' provisioning state:: - baremetal node list + # Note that a different user is required to see the Ironic nodes + OS_CLOUD=devstack-system-admin openstack baremetal node list +--------------------------------------+--------+--------------------------------------+-------------+--------------------+-------------+ | UUID | Name | Instance UUID | Power State | Provisioning State | Maintenance | +--------------------------------------+--------+--------------------------------------+-------------+--------------------+-------------+ @@ -342,7 +343,7 @@ This provisioning process may take some time depending on the performance of the host system, but Ironic should eventually show the node as having an 'active' provisioning state:: - baremetal node list + OS_CLOUD=devstack-system-admin openstack baremetal node list +--------------------------------------+--------+--------------------------------------+-------------+--------------------+-------------+ | UUID | Name | Instance UUID | Power State | Provisioning State | Maintenance | +--------------------------------------+--------+--------------------------------------+-------------+--------------------+-------------+ diff --git a/doc/source/contributor/ironic-boot-from-volume.rst b/doc/source/contributor/ironic-boot-from-volume.rst index 3291a7a1bb..5035c78243 100644 --- a/doc/source/contributor/ironic-boot-from-volume.rst +++ b/doc/source/contributor/ironic-boot-from-volume.rst @@ -108,7 +108,9 @@ description for DevStack is at :ref:`deploy_devstack`. After the environment is built, you can create a volume with cinder and request an instance with the volume to nova:: - . ~/devstack/openrc + # set up the user for authentication purposes + # note that all users can be seen in /etc/openstack/clouds.yaml + export OS_CLOUD=devstack-admin-demo # query the image id of the default cirros image image=$(openstack image show $DEFAULT_IMAGE_NAME -f value -c id)