Merge remote-tracking branch 'origin' into future

[astakos] / snf-astakos-app / README

diff --git a/snf-astakos-app/README b/snf-astakos-app/README
index 617ea32..f7c4c01 100644 (file)
--- a/snf-astakos-app/README
+++ b/snf-astakos-app/README
@@ -89,6 +89,16 @@ ASTAKOS_ADMIN_NOTIFICATION_EMAIL_SUBJECT    '%s alpha2 testing account created (
 ASTAKOS_HELPDESK_NOTIFICATION_EMAIL_SUBJECT '%s alpha2 testing account activated (%%(user)s)' % SITENAME                    Account activation helpdesk notification email subject
 ASTAKOS_EMAIL_CHANGE_EMAIL_SUBJECT          'Email change on %s alpha2 testing' % SITENAME                                  Email change subject               
 ASTAKOS_PASSWORD_RESET_EMAIL_SUBJECT        'Password reset on %s alpha2 testing' % SITENAME                                Password change email subject
+
+ASTAKOS_QUOTA_HOLDER_URL                    ''                                                                              The quota holder URI
+                                                                                                                    e.g. ``http://localhost:8080/api/quotaholder/v``
+ASTAKOS_SERVICES                            {'cyclades': {'url':'https://node1.example.com/ui/', 'quota': {'vm': 2}},       Cloud service default url and quota      
+                                            'pithos+':  {'url':'https://node2.example.com/ui/', 'quota': {                  
+                                            'diskspace': 50 * 1024 * 1024 * 1024}}})                                        
+ASTAKOS_AQUARIUM_URL                        ''                                                                              The billing (aquarium) URI
+                                                                                                                    e.g. ``http://localhost:8888/user``
+ASTAKOS_PAGINATE_BY                         10                                                                              Number of object to be displayed per page
+
 ASTAKOS_NEWPASSWD_INVALIDATE_TOKEN          True                                                                            Enforce token renewal on password change/reset. If set to False, user can optionally decide
                                                                                                                             whether to renew the token or not.
 =========================================== =============================================================================   ===========================================================================================
@@ -116,11 +126,4 @@ showuser         Show user info
 
 To update user credibility from the billing system (Aquarium), enable the queue, install snf-pithos-tools and use ``pithos-dispatcher``::
 
-    pithos-dispatcher --exchange=aquarium --callback=astakos.im.queue.listener.on_creditevent
-
-Load groups:
-------------
-
-To set the initial user groups load the followind fixture:
-
-    snf-manage loaddata groups
+    pithos-dispatcher --exchange=aquarium --callback=astakos.im.endpoints.aquarium.consumer.on_creditevent