commit a0dce264d93909af3052e1fa59210032bb9a994d
author Dean Troyer <dtroyer@gmail.com> Tue Dec 11 16:52:37 2012 -0600
committer Dean Troyer <dtroyer@gmail.com> Tue Dec 11 17:34:28 2012 -0600
tree af1ccf7973e0bf6d398ebac72393b7fb6e573a2d
parent 00626a3186650fb111d9af5e2d69311aa5b3d3c2

Move Nova account creation out of keystone_data.sh

Supports the coming HA/proxy configuration for Nova

Change-Id: I2baf1f51486537a1489f1376d38f5710bd96c314

files/keystone_data.sh

diff --git a/files/keystone_data.sh b/files/keystone_data.sh
index c8e68dd..32d4e1a 100755
--- a/files/keystone_data.sh
+++ b/files/keystone_data.sh
@@ -5,7 +5,6 @@
 # Tenant               User       Roles
 # ------------------------------------------------------------------
 # service              glance     admin
-# service              nova       admin, [ResellerAdmin (swift only)]
 # service              quantum    admin        # if enabled
 # service              swift      admin        # if enabled
 # service              cinder     admin        # if enabled
@@ -53,29 +52,8 @@
 # Services
 # --------
 
-# Nova
-if [[ "$ENABLED_SERVICES" =~ "n-api" ]]; then
-    NOVA_USER=$(get_id keystone user-create \
-        --name=nova \
-        --pass="$SERVICE_PASSWORD" \
-        --tenant_id $SERVICE_TENANT \
-        --email=nova@example.com)
-    keystone user-role-add \
-        --tenant_id $SERVICE_TENANT \
-        --user_id $NOVA_USER \
-        --role_id $ADMIN_ROLE
-    if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
-        NOVA_SERVICE=$(get_id keystone service-create \
-            --name=nova \
-            --type=compute \
-            --description="Nova Compute Service")
-        keystone endpoint-create \
-            --region RegionOne \
-            --service_id $NOVA_SERVICE \
-            --publicurl "http://$SERVICE_HOST:\$(compute_port)s/v2/\$(tenant_id)s" \
-            --adminurl "http://$SERVICE_HOST:\$(compute_port)s/v2/\$(tenant_id)s" \
-            --internalurl "http://$SERVICE_HOST:\$(compute_port)s/v2/\$(tenant_id)s"
-    fi
+if [[ "$ENABLED_SERVICES" =~ "n-api" ]] && [[ "$ENABLED_SERVICES" =~ "swift" ]]; then
+    NOVA_USER=$(keystone user-list | awk "/ nova / { print \$2 }")
     # Nova needs ResellerAdmin role to download images when accessing
     # swift through the s3 api.
     keystone user-role-add \