Periodic formatting cleanup
This is the semi-irregular comment and docs cleanup.
No functional changes should be here although some code is moved in a
small attempt to sort functions and get things where they need to be.
Change-Id: Ib4a3e2590c6fbd016c391acc7aef6421e91c0dca
diff --git a/lib/keystone b/lib/keystone
index 6bf4d9f..2edd137 100644
--- a/lib/keystone
+++ b/lib/keystone
@@ -178,7 +178,6 @@
cp $KEYSTONE_DIR/etc/logging.conf.sample $KEYSTONE_CONF_DIR/logging.conf
iniset $KEYSTONE_CONF_DIR/logging.conf logger_root level "DEBUG"
iniset $KEYSTONE_CONF_DIR/logging.conf logger_root handlers "devel,production"
-
}
# create_keystone_accounts() - Sets up common required keystone accounts
@@ -254,25 +253,6 @@
--adminurl "$KEYSTONE_AUTH_PROTOCOL://$KEYSTONE_AUTH_HOST:$KEYSTONE_AUTH_PORT/v2.0" \
--internalurl "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0"
fi
-
- # TODO(dtroyer): This is part of a series of changes...remove these when
- # complete if they are really unused
-# KEYSTONEADMIN_ROLE=$(keystone role-create \
-# --name KeystoneAdmin \
-# | grep " id " | get_field 2)
-# KEYSTONESERVICE_ROLE=$(keystone role-create \
-# --name KeystoneServiceAdmin \
-# | grep " id " | get_field 2)
-
- # TODO(termie): these two might be dubious
-# keystone user-role-add \
-# --user_id $ADMIN_USER \
-# --role_id $KEYSTONEADMIN_ROLE \
-# --tenant_id $ADMIN_TENANT
-# keystone user-role-add \
-# --user_id $ADMIN_USER \
-# --role_id $KEYSTONESERVICE_ROLE \
-# --tenant_id $ADMIN_TENANT
}
# init_keystone() - Initialize databases, etc.
@@ -339,6 +319,7 @@
screen -S $SCREEN_NAME -p key -X kill
}
+
# Restore xtrace
$XTRACE