Tidy up redundant logic

Author: dhague

pkg/api/keystone/keystone.go

@@ -66,11 +66,7 @@ func getNewToken(c *middleware.Context) (string, error) {
 
 	var keystonePasswordObj interface{}
 	if setting.KeystoneCookieCredentials {
-		if setting.KeystoneCredentialAesKey != "" {
-			keystonePasswordObj = c.GetCookie(middleware.SESS_KEY_PASSWORD)
-		} else {
-			keystonePasswordObj = c.GetCookie(middleware.SESS_KEY_PASSWORD)
-		}
+		keystonePasswordObj = c.GetCookie(middleware.SESS_KEY_PASSWORD)
 		if keystonePasswordObj == nil {
 			return "", errors.New("Couldn't find cookie containing keystone password")
 		} else {