Some glance keystone changes from getting started guide

https://fedoraproject.org/w/index.php?title=Getting_started_with_OpenStack_on_Fedora_17&diff=prev&oldid=279696

Signed-off-by: Steven Dake <sdake@redhat.com>

diff --git a/tools/openstack b/tools/openstack
index dc5fa0b35925738aeaaa7012c3e0889cf27900d4..f22eae6f53b6b6c41d74f1ea67f390b5ba0f4588 100755 (executable)
--- a/tools/openstack
+++ b/tools/openstack
@@ -91,6 +91,7 @@ export ADMIN_TOKEN=$(openssl rand -hex 10)
 export OS_USERNAME=admin
 export OS_PASSWORD=verybadpass
 export OS_TENANT_NAME=admin
+export OS_SERVICE_PASS=verybadpass
 export OS_AUTH_URL=http://127.0.0.1:5000/v2.0/
 export OS_AUTH_STRATEGY=keystone
 EOF
@@ -100,15 +101,20 @@ EOF
        sudo openstack-config-set /etc/keystone/keystone.conf DEFAULT admin_token $ADMIN_TOKEN
        os_start
        sleep 1
-       sudo ADMIN_PASSWORD=$OS_PASSWORD SERVICE_PASSWORD=servicepass openstack-keystone-sample-data
+       sudo ADMIN_PASSWORD=$OS_PASSWORD SERVICE_PASSWORD=OS_SERVICE_PASS openstack-keystone-sample-data
        sudo openstack-config-set /etc/nova/api-paste.ini filter:authtoken admin_tenant_name service
        sudo openstack-config-set /etc/nova/api-paste.ini filter:authtoken admin_user nova
-       sudo openstack-config-set /etc/nova/api-paste.ini filter:authtoken admin_password servicepass
+       sudo openstack-config-set /etc/nova/api-paste.ini filter:authtoken admin_password OS_SERVICE_PASS
        sudo openstack-config-set /etc/nova/nova.conf DEFAULT auth_strategy keystone
-       sudo openstack-config-set /etc/glance/glance-api.conf paste_deploy flavor keystone
+sudo openstack-config-set /etc/glance/glance-api.conf paste_deploy flavor keystone
        sudo openstack-config-set /etc/glance/glance-registry.conf paste_deploy flavor keystone
-       sudo openstack-config-set /etc/glance/glance-api-paste.ini filter:authtoken admin_token $ADMIN_TOKEN
-       sudo openstack-config-set /etc/glance/glance-registry-paste.ini filter:authtoken admin_token $ADMIN_TOKEN
+       sudo openstack-config-set /etc/glance/glance-api-paste.ini filter:authtoken admin_tenant_name service
+       sudo openstack-config-set /etc/glance/glance-api-paste.ini filter:authtoken admin_user glance
+       sudo openstack-config-set /etc/glance/glance-api-paste.ini filter:authtoken admin_password OS_SERVICE_PASS
+       sudo openstack-config-set /etc/glance/glance-registry-paste.ini filter:authtoken admin_tenant_name service
+       sudo openstack-config-set /etc/glance/glance-registry-paste.ini filter:authtoken admin_user glance
+       sudo openstack-config-set /etc/glance/glance-registry-paste.ini filter:authtoken admin_password OS_SERVICE_PASS
+
        os_stop
        sleep 1
        os_start