diff --git a/Changelog b/Changelog index 1397d5fe3314826f58403a587f9c13599d87b36f..082e53a1ea2c8500b833458a7d71e85de2f7978d 100644 --- a/Changelog +++ b/Changelog @@ -27,6 +27,12 @@ Cyclades * Remove 'CYCLADES_USER_CATALOG_URL' and 'CYCLADES_USER_FEEDBACK_URL' settings * Remove CYCLADES_USE_QUOTAHOLDER, CYCLADES_QUOTAHOLDER_TOKEN, CYCLADES_QUOTAHOLDER_URL, CYCLADES_QUOTAHOLDER_POOLSIZE settings +* Rename 'cyclades-usage-verify' management command to + 'reconcile-resources-cyclades'. Also, remove 'cyclades-usage-reset' command, + which is equivalent to 'reconcile-resources-cyclades --fix'. +* Rename 'cyclades-reconcile-commissions' management command to + 'reconcile-commissions-cyclades'. + Pithos ------ diff --git a/docs/quick-install-admin-guide.rst b/docs/quick-install-admin-guide.rst index 83a52aed9510748f3d90c789e8cce52b963452c5..d7bdb89d9c3e473fca6c05d79c98d7f527e2e56b 100644 --- a/docs/quick-install-admin-guide.rst +++ b/docs/quick-install-admin-guide.rst @@ -2004,7 +2004,7 @@ Apply Quotas node1 # snf-manage astakos-quota --verify node1 # snf-manage astakos-quota --sync node2 # snf-manage pithos-reset-usage - node1 # snf-manage cyclades-reset-usage + node1 # snf-manage reconcile-resources-cyclades --fix If all the above return successfully, then you have finished with the Cyclades and Plankton installation and setup. diff --git a/snf-cyclades-app/synnefo/quotas/management/commands/cyclades-reconcile-commissions.py b/snf-cyclades-app/synnefo/quotas/management/commands/reconcile-commissions-cyclades.py similarity index 95% rename from snf-cyclades-app/synnefo/quotas/management/commands/cyclades-reconcile-commissions.py rename to snf-cyclades-app/synnefo/quotas/management/commands/reconcile-commissions-cyclades.py index a2943e0276f8398a281d4021bcf64dec33a40912..54a3241cc8d45e887b892ba38708a0911070ad21 100644 --- a/snf-cyclades-app/synnefo/quotas/management/commands/cyclades-reconcile-commissions.py +++ b/snf-cyclades-app/synnefo/quotas/management/commands/reconcile-commissions-cyclades.py @@ -1,4 +1,4 @@ -# Copyright 2012 GRNET S.A. All rights reserved. +# Copyright 2012-2013 GRNET S.A. All rights reserved. # # Redistribution and use in source and binary forms, with or # without modification, are permitted provided that the following @@ -38,7 +38,7 @@ from synnefo import quotas class Command(BaseCommand): - help = "Reconcile quotas with Quotaholder" + help = "Detect and resolve pending commissions to Quotaholder" output_transaction = True option_list = BaseCommand.option_list + ( make_option("--fix", dest="fix", diff --git a/snf-cyclades-app/synnefo/quotas/management/commands/cyclades-usage-verify.py b/snf-cyclades-app/synnefo/quotas/management/commands/reconcile-resources-cyclades.py similarity index 96% rename from snf-cyclades-app/synnefo/quotas/management/commands/cyclades-usage-verify.py rename to snf-cyclades-app/synnefo/quotas/management/commands/reconcile-resources-cyclades.py index 55aa82871e6ed6d95aeeea577a97cc52be18fd4c..44f8276186f52f85df87b6d8a17814eafd9da16c 100644 --- a/snf-cyclades-app/synnefo/quotas/management/commands/cyclades-usage-verify.py +++ b/snf-cyclades-app/synnefo/quotas/management/commands/reconcile-resources-cyclades.py @@ -43,9 +43,9 @@ from synnefo.settings import CYCLADES_ASTAKOS_SERVICE_TOKEN as ASTAKOS_TOKEN class Command(BaseCommand): - help = """Reconcile quotas of Astakos with Cyclades DB. + help = """Reconcile resource usage of Astakos with Cyclades DB. - Detect unsynchronized quotas between Astakos and Cyclades DB and + Detect unsynchronized usage between Astakos and Cyclades DB resources and synchronize them if specified so. """