Revision cbb596d4

b/docs/quick-install-admin-guide.rst
211 211

  
212 212
This will create a ``01.pem`` and a ``node1.example.com.key`` files in the 
213 213
``/etc/openvpn/easy-rsa/2.0/keys`` directory. Copy these in ``/etc/ssl/certs/``
214
and ``/etc/ssl/private/`` respectively and use them in the apache2 
214
and ``/etc/ssl/private/`` respectively and use them in the apache2
215 215
configuration file below instead of the defaults.
216 216

  
217 217
Apache2 setup
......
758 758
.. code-block:: python
759 759

  
760 760
    EMAIL_BACKEND = 'django.core.mail.backends.filebased.EmailBackend'
761
    EMAIL_FILE_PATH = '/tmp/app-messages' 
762
  
761
    EMAIL_FILE_PATH = '/tmp/app-messages'
763 762

  
764 763

  
765 764
Enable Pooling
......
1349 1348
It's time to install Ganeti. To be able to use hotplug (which will be part of 
1350 1349
the official Ganeti 2.10), we recommend using our Ganeti package version:
1351 1350

  
1352
`2.8.2+snapshot1+b64v1+hotplug5+ippoolfix+rapifix+netxen+lockfix2-1~wheezy`
1351
``2.8.2+snapshot1+b64v1+kvmopts1+extfix1+hotplug5+lockfix3+ippoolfix+rapifix+netxen-1~wheezy``
1353 1352

  
1354 1353
Let's briefly explain each patch:
1355 1354

  
1356
    * hotplug: hotplug devices (NICs and Disks) (ganeti 2.10)
1357
    * b64v1: Save bitarray of network IP pools in config file, encoded in base64, instead of 0/1.
1358
    * ippoolfix: Ability to give an externally reserved IP to an instance (e.g. gateway IP).  (ganeti 2.10)
1359
    * rapifix: Extend RAPI το support 'depends' and 'shutdown_timeout' body arguments. (ganeti 2.9)
1360
    * netxen: Network configuration for xen instances, exactly like in kvm instances. (ganeti 2.9)
1355
    * hotplug: hotplug devices (NICs and Disks) (ganeti 2.10).
1356
    * b64v1: Save bitarray of network IP pools in config file, encoded in 
1357
      base64, instead of 0/1.
1358
    * ippoolfix: Ability to give an externally reserved IP to an instance (e.g.
1359
      gateway IP)  (ganeti 2.10).
1360
    * kvmopts: Export disk geometry to kvm command and add migration 
1361
      capabilities.
1362
    * extfix: Includes:
1363

  
1364
      * exports logical id in hooks.
1365
      * adds better arbitrary params support (modification, deletion).
1366
      * cache, heads, cyls arbitrary params reach kvm command.
1367

  
1368
    * rapifix: Extend RAPI το support 'depends' and 'shutdown_timeout' body 
1369
      arguments. (ganeti 2.9).
1370
    * netxen: Network configuration for xen instances, exactly like in kvm 
1371
      instances. (ganeti 2.9).
1361 1372
    * lockfix2: Fixes for 2 locking issues:
1362 1373

  
1363
      - Issue 622: Fix for opportunistic locking that caused an assertion error (Patch waiting in ganeti-devel list)
1364
      - Issue 621: Fix for network locking issue that resulted in: [Lock 'XXXXXX' not found in set 'instance' (it may have been removed)]
1374
      * Issue 622: Fix for opportunistic locking that caused an assertion 
1375
        error (Patch waiting in ganeti-devel list).
1376
      * Issue 621: Fix for network locking issue that resulted in: [Lock 
1377
        'XXXXXX' not found in set 'instance' (it may have been removed)].
1365 1378

  
1366
    * snapshot: Add trivial 'snapshot' functionality that is unused by Synnefo or Ganeti.
1379
    * snapshot: Add trivial 'snapshot' functionality that is unused by Synnefo
1380
      or Ganeti.
1367 1381

  
1368 1382
To install Ganeti run:
1369 1383

  
......
1396 1410

  
1397 1411
``br1`` will be the default interface for any newly created VMs.
1398 1412

  
1399
You can verify that the ganeti cluster is successfully setup,by running on the
1413
You can verify that the ganeti cluster is successfully setup, by running on the
1400 1414
:ref:`GANETI-MASTER <GANETI_NODES>` (in our case node1):
1401 1415

  
1402 1416
.. code-block:: console
......
1561 1575
 * ``img_passwd``: the arbitrary root password of your new instance
1562 1576
 * ``img_format``: set to ``diskdump`` to reflect the type of the uploaded Image
1563 1577
 * ``img_id``: If you want to deploy an Image stored on Pithos (our case), this
1564
               should have the format ``pithosmap://<HashMap>/<size>``:
1578
   should have the format ``pithosmap://<HashMap>/<size>``:
1579

  
1565 1580
               * ``HashMap``: the map of the file
1566 1581
               * ``size``: the size of the file, same size as reported in 
1567
                 ``ls -la filename``
1582
                 ``ls -l filename``
1583

  
1568 1584
 * ``img_properties``: taken from the metadata file. Used only the two mandatory
1569 1585
                       properties ``OSFAMILY`` and ``ROOT_PARTITION``. `Learn more
1570 1586
                       <http://www.synnefo.org/docs/snf-image/latest/usage.html#image-properties>`_

Also available in: Unified diff