Commit a842e545 authored by Giorgos Korfiatis's avatar Giorgos Korfiatis
Browse files

Merge branch 'release-0.13' into develop

parents 8a221a91 934b0d27
......@@ -137,6 +137,67 @@ Automatic activation
FIXME: Describe Regex activation method
Setting quota limits
~~~~~~~~~~~~~~~~~~~~
Set default quotas
``````````````````
In 20-snf-astakos-app-settings.conf,
uncomment the default setting ``ASTAKOS_SERVICES``
and customize the ``'uplimit'`` values.
These are the default base quotas for all users.
To apply your configuration run::
# snf-manage astakos-init --load-service-resources
# snf-manage astakos-quota --sync
Set base quotas for individual users
````````````````````````````````````
For individual users that need different quotas than the default
you can set it for each resource like this::
# use this to display quotas / uuid
# snf-manage user-show 'uuid or email'
# snf-manage user-set-initial-quota --set-capacity 'user-uuid' 'cyclades.vm' 10
# this applies the configuration
# snf-manage astakos-quota --sync --user 'user-uuid'
Enable the Projects feature
~~~~~~~~~~~~~~~~~~~~~~~~~~~
If you want to enable the projects feature so that users may apply
on their own for resources by creating and joining projects,
in ``20-snf-astakos-app-settings.conf`` set::
# this will allow at most one pending project application per user
ASTAKOS_PENDING_APPLICATION_LIMIT = 1
# this will make the 'projects' page visible in the dashboard
ASTAKOS_PROJECTS_VISIBLE = True
When users apply for projects they are not automatically granted
the resources. They must first be approved by the administrator.
To list pending project applications in astakos::
# snf-manage project-list --pending
Note the last column, the application id. To approve it::
# <app id> from the last column of project-list
# snf-manage project-control --approve <app id>
To deny an application::
# snf-manage project-control --deny <app id>
Astakos advanced operations
---------------------------
......@@ -1174,7 +1235,7 @@ Older Cyclades Upgrade Notes
.. toctree::
:maxdepth: 2
upgrade/cyclades-upgrade
Upgrade <upgrade/cyclades-upgrade>
Changelog
=========
......@@ -65,7 +65,7 @@ Synnefo running with two different storage backends.
Synnefo Guides
==============
There are 4 guides for Synnefo.
There are 3 guides for Synnefo.
.. For the really impatient snf-deploy tool allows you to install all software
.. components from scratch (creating locally kvm based Virtual Machines) or to an
......@@ -73,26 +73,29 @@ There are 4 guides for Synnefo.
.. configuration, vanilla debian squeeze and installed ssh keys). Please note that
.. this should be used only for testing or demo installations because most of the
.. times the prerequisites cannot be satisfied due to the underlying
.. infrastructure complexity (especially as far as networks is conserned).
.. infrastructure complexity (especially as far as networks is concerned).
The quick installation guide describes how to install the whole Synnefo stack
in just two physical nodes, for testing purposes. This guide is useful to those
interested in deploying Synnefo in large scale, as a starting point that will
help them get familiar with the Synnefo components and overall architecture, as
well as the interconnection between different services. Such an installation,
also provides a quick preview of the basic Synnefo features, although we would
like to think that Synnefo's real power unveils while scaling.
also provides a quick preview of the basic Synnefo features, although we like to
think that Synnefo's real power unveils while scaling.
The Administrator's Guide targets system administrators, who want to dive into
more details and common tasks regarding Synnefo. For the experienced Synnefo
administrator, there is also a section that describes how to deploy Synnefo in
large scale with a corresponding guide.
administrator, there is also a section that describes how to do scale-out
Synnefo deployments with corresponding examples. This targets large scale
installations of Synnefo.
The Developer's Guide targets developers, who want to build on top of Synnefo
and so describes all the different types of interfaces Synnefo provides to the
external world. The Integrator's Guide targets developers, who want to actually
extend/modify/change Synnefo itself, so describes Synnefo's indepth
architecture and the internals of Synnefo components (currently out-of-date!).
external world. Also documents all Synnefo external REST APIs.
.. The Integrator's Guide targets developers, who want to actually
.. extend/modify/change Synnefo itself, so describes Synnefo's indepth
.. architecture and the internals of Synnefo components (currently out-of-date!).
.. toctree::
......@@ -105,7 +108,6 @@ architecture and the internals of Synnefo components (currently out-of-date!).
Administrator's Guide <admin-guide>
Developer's Guide <dev-guide>
Integrator's Guide <intgrt-guide>
List of all Synnefo components
......
......@@ -975,6 +975,35 @@ like this:
),
}
Stamp Database Revision
-----------------------
Pithos uses the alembic_ database migrations tool.
.. _alembic: http://alembic.readthedocs.org
After a sucessful installation, we should stamp it with the most recent
revision, in order to be able in the future to define the migrations should run
in subsequent upgrades.
In order to find the most recent revision, we check the migration history:
.. code-block:: console
root@node2:~ # pithos-migrate history
2a309a9a3438 -> 27381099d477 (head), alter public add column url
165ba3fbfe53 -> 2a309a9a3438, fix statistics negative population
3dd56e750a3 -> 165ba3fbfe53, update account in paths
230f8ce9c90f -> 3dd56e750a3, Fix latest_version
8320b1c62d9 -> 230f8ce9c90f, alter nodes add column latest version
None -> 8320b1c62d9, create index nodes.parent
Finally, we stamp it with the one found in the previous step:
.. code-block:: console
root@node2:~ # pithos-migrate stamp 27381099d477
Servers Initialization
----------------------
......@@ -1393,6 +1422,7 @@ Assuming ``eth0`` on both hosts is the public interface (directly connected
to the router), run on every node:
.. code-block:: console
# apt-get install vlan
# brctl addbr br0
# ip link set br0 up
......
......@@ -96,7 +96,7 @@ from astakos.im.functions import (
send_feedback, SendMailError,
logout as auth_logout,
activate as activate_func,
invite,
invite as invite_func,
send_activation as send_activation_func,
SendNotificationError,
reached_pending_application_limit,
......@@ -315,7 +315,7 @@ def invite(request, template_name='im/invitations.html', extra_context=None):
try:
email = form.cleaned_data.get('username')
realname = form.cleaned_data.get('realname')
invite(inviter, email, realname)
invite_func(inviter, email, realname)
message = _(astakos_messages.INVITATION_SENT) % locals()
messages.success(request, message)
except SendMailError, e:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment