From 495f8199f86aa0fc22af8f634dc085715b35f849 Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Wed, 13 Apr 2016 11:47:46 +0200 Subject: [PATCH] [install] move OS_IMAGE_API_VERSION variable into "Create OpenStack client environment scripts" The installation of the image service is not optional, because of that it is not necessary to manually add the OS_IMAGE_API_VERSION variable to the OpenStack client environment scripts after the installation of the image service Change-Id: Ic84e7910d166dbe9dd3da7888f3ee65280b1fdc3 --- doc/install-guide/source/glance-verify.rst | 8 -------- doc/install-guide/source/keystone-openrc.rst | 2 ++ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/doc/install-guide/source/glance-verify.rst b/doc/install-guide/source/glance-verify.rst index 6610244d82..814bf1fc88 100644 --- a/doc/install-guide/source/glance-verify.rst +++ b/doc/install-guide/source/glance-verify.rst @@ -16,14 +16,6 @@ For information about how to manage images, see the Perform these commands on the controller node. -#. In each client environment script, configure the Image service - client to use API version 2: - - .. code-block:: console - - $ echo "export OS_IMAGE_API_VERSION=2" \ - | tee -a admin-openrc demo-openrc - #. Source the ``admin`` credentials to gain access to admin-only CLI commands: diff --git a/doc/install-guide/source/keystone-openrc.rst b/doc/install-guide/source/keystone-openrc.rst index 4952a822cc..de0d8ee77c 100644 --- a/doc/install-guide/source/keystone-openrc.rst +++ b/doc/install-guide/source/keystone-openrc.rst @@ -28,6 +28,7 @@ scripts to load appropriate credentials for client operations. export OS_PASSWORD=ADMIN_PASS export OS_AUTH_URL=http://controller:35357/v3 export OS_IDENTITY_API_VERSION=3 + export OS_IMAGE_API_VERSION=2 Replace ``ADMIN_PASS`` with the password you chose for the ``admin`` user in the Identity service. @@ -43,6 +44,7 @@ scripts to load appropriate credentials for client operations. export OS_PASSWORD=DEMO_PASS export OS_AUTH_URL=http://controller:5000/v3 export OS_IDENTITY_API_VERSION=3 + export OS_IMAGE_API_VERSION=2 Replace ``DEMO_PASS`` with the password you chose for the ``demo`` user in the Identity service.