Revision c0d88cf3

b/docs/admin-guide.rst
847 847
   $ kamaki config set user.url https://accounts.example.com
848 848
   $ kamaki config set token ...
849 849

  
850
To test that everything works, try authenticating the current account with kamaki:
850
To test that everything works, try authenticating the current account with
851
kamaki:
851 852

  
852 853
.. code-block:: console
853 854

  
854 855
  $ kamaki user authenticate
855 856

  
856
This will output some user information. For example, *uuid* (unique user id) is quite useful.
857
This will output user information.
857 858

  
858 859
Upload Image
859 860
------------
860 861

  
861
By convention, images are stored in a container called ``images``. Check if the container exists, by listing all containers in your account:
862
By convention, images are stored in a container called ``images``. Check if the
863
container exists, by listing all containers in your account:
862 864

  
863 865
.. code-block:: console
864 866

  
......
870 872

  
871 873
  $ kamaki file create images
872 874

  
873
You are now ready to upload an image to container ``images``. You can upload it with a Pithos+ client, or use kamaki directly:
875
You are now ready to upload an image to container ``images``. You can upload it
876
with a Pithos+ client, or use kamaki directly:
874 877

  
875 878
.. code-block:: console
876 879

  
877 880
   $ kamaki file upload ubuntu.iso images
878 881

  
879
You can use any Pithos+ client to verify that the image was uploaded correctly, or you can list the contents of the container with kamaki:
882
You can use any Pithos+ client to verify that the image was uploaded correctly,
883
or you can list the contents of the container with kamaki:
880 884

  
881 885
.. code-block:: console
882 886

  
883 887
  $ kamaki file list images
884 888

  
885 889
The full Pithos URL for the previous example will be
886
``pithos://u53r-un1qu3-1d/images/ubuntu.iso``
887
where ``u53r-un1qu3-1d`` is the unique user id (uuid).
888

  
890
``pithos://u53r-un1qu3-1d/images/ubuntu.iso`` where ``u53r-un1qu3-1d`` is the
891
unique user id (uuid).
889 892

  
890 893
Register Image
891 894
--------------
b/docs/quick-install-admin-guide.rst
2093 2093

  
2094 2094
The USER_TOKEN appears on the user's `Profile` web page on the Astakos Web UI.
2095 2095

  
2096
You can see that the new configuration options have been applied correctly, either by checking the editable file ``~/.kamakirc`` or by running:
2096
You can see that the new configuration options have been applied correctly,
2097
either by checking the editable file ``~/.kamakirc`` or by running:
2097 2098

  
2098 2099
.. code-block:: console
2099 2100

  
2100 2101
   $ kamaki config list
2101 2102

  
2102
A quick test to check if kamaki is configured correctly is a user authentication based on the provided token:
2103
A quick test to check that kamaki is configured correctly, is to try to
2104
authenticate a user based on his/her token (in this case the user is you):
2103 2105

  
2104 2106
.. code-block:: console
2105 2107

  
2106 2108
  $ kamaki user authenticate
2107 2109

  
2108
The above operation should provide various user information, e.g. UUID (the unique user id) which might prove useful in some operations.
2110
The above operation provides various user information, e.g. UUID (the unique
2111
user id) which might prove useful in some operations.
2109 2112

  
2110 2113
Upload an Image file to Pithos+
2111 2114
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
......
2128 2131

  
2129 2132
   $ kamaki file create images
2130 2133

  
2131
To check if the container has been created, list all containers of your account:
2134
To check if the container has been created, list all containers of your
2135
account:
2132 2136

  
2133 2137
.. code-block:: console
2134 2138

  
......
2140 2144

  
2141 2145
   $ kamaki file upload /srv/images/debian_base-6.0-7-x86_64.diskdump images
2142 2146

  
2143
The first is the local path and the second is the remote container on Pithos+. Check if the file has been uploaded, by listing the container contents:
2147
The first is the local path and the second is the remote container on Pithos+.
2148
Check if the file has been uploaded, by listing the container contents:
2144 2149

  
2145 2150
.. code-block:: console
2146 2151

  
......
2151 2156
Register an existing Image file to Plankton
2152 2157
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2153 2158

  
2154
For the purposes of the following example, we assume that the user UUID is ``u53r-un1qu3-1d``.
2159
For the purposes of the following example, we assume that the user UUID is
2160
``u53r-un1qu3-1d``.
2155 2161

  
2156 2162
Once the Image file has been successfully uploaded on Pithos+ then we register
2157 2163
it to Plankton (so that it becomes visible to Cyclades), by running:
......
2159 2165
.. code-block:: console
2160 2166

  
2161 2167
   $ kamaki image register "Debian Base" \
2162
                  pithos://u53r-un1qu3-1d/images/debian_base-6.0-7-x86_64.diskdump \
2163
                  --public \
2164
                  --disk-format=diskdump \
2165
                  --property OSFAMILY=linux --property ROOT_PARTITION=1 \
2166
                  --property description="Debian Squeeze Base System" \
2167
                  --property size=451 --property kernel=2.6.32 --property GUI="No GUI" \
2168
                  --property sortorder=1 --property USERS=root --property OS=debian
2168
                           pithos://u53r-un1qu3-1d/images/debian_base-6.0-7-x86_64.diskdump \
2169
                           --public \
2170
                           --disk-format=diskdump \
2171
                           --property OSFAMILY=linux --property ROOT_PARTITION=1 \
2172
                           --property description="Debian Squeeze Base System" \
2173
                           --property size=451 --property kernel=2.6.32 --property GUI="No GUI" \
2174
                           --property sortorder=1 --property USERS=root --property OS=debian
2169 2175

  
2170 2176
This command registers the Pithos+ file
2171 2177
``pithos://u53r-un1qu3-1d/images/debian_base-6.0-7-x86_64.diskdump`` as an

Also available in: Unified diff