diff --git a/doc/source/client.rst b/doc/source/client.rst index 540b12a58..d1be1a969 100644 --- a/doc/source/client.rst +++ b/doc/source/client.rst @@ -204,7 +204,7 @@ The available keys are: * ``type`` indicates the service that refers the credential. The services supported are ``InfrastructureManager``, ``VMRC``, ``OpenNebula``, ``EC2``,, ``FogBow``, ``OpenStack``, ``OCCI``, ``LibCloud``, ``Docker``, ``GCE``, ``Azure``, ``AzureClassic``, - ``Kubernetes``, ``vSphere``, ``Linode`` and ``Orange``. + ``Kubernetes``, ``vSphere``, ``Linode``, ``Orange`` and ``EGI``. * ``username`` indicates the user name associated to the credential. In EC2 it refers to the *Access Key ID*. In GCE it refers to *Service Account’s Email Address*. @@ -220,6 +220,7 @@ The available keys are: This field is only used in the OpenStack and Orange plugins. * ``host`` indicates the address of the access point to the cloud provider. + In case of EGI connector it indicates the site name. This field is not used in IM, GCE, Azure, and EC2 credentials. * ``proxy`` indicates the content of the proxy file associated to the credential. @@ -247,7 +248,10 @@ The available keys are: plugin check the documentation of the Azure python SDK: `here `_ -* ``token`` indicates the OpenID token associated to the credential. This field is used in the OCCI plugin (from version 1.6.2). +* ``token`` indicates the OpenID token associated to the credential. This field is used in the EGI and OCCI plugins. + +* ``vo`` indicates the VO name associated to the credential. This field is used in the EGI plugin. + OpenStack additional fields ^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -341,6 +345,9 @@ So the auth line will be like that:: id = ost; type = OpenStack; host = https://ostserver:5000; username = egi.eu; tenant = openid; password = egi_aai_token_value; auth_version = 3.x_oidc_access_token; domain = project_name +From IM version 1.10.2 the EGI connector is available and you can use this kind of auth line:: + + id = egi; type = EGI; host = CESGA; vo = vo.access.egi.eu; token = egi_aai_token_value Open Telekom Cloud ++++++++++++++++++ @@ -397,6 +404,8 @@ An example of the auth file:: id = linode; type = Linode; username = apikey # Orange Flexible Cloud auth data id = orange; type = Orange; username = usern; password = pass; domain = DOMAIN; region = region; tenant = tenant + # EGI auth data + id = egi; type = EGI; host = SITE_NAME; vo = vo_name; token = egi_aai_token_value IM Server does not store the credentials used in the creation of infrastructures. Then the user has to provide them in every call of diff --git a/doc/source/manual.rst b/doc/source/manual.rst index d49617f9e..4820d6f9e 100644 --- a/doc/source/manual.rst +++ b/doc/source/manual.rst @@ -77,7 +77,7 @@ Optional Packages In newer versions (9.0 and later) the functionality has been moved `the cheroot library`_ it can be installed using pip. * `apache-libcloud `_ 3.0 or later is used in the - LibCloud, OpenStack and GCE connectors. + LibCloud, OpenStack, EGI and GCE connectors. * `boto `_ 2.29.0 or later is used as interface to Amazon EC2. It is available as package named ``python-boto`` in Debian based distributions. It can also be downloaded from `boto GitHub repository `_. diff --git a/doc/source/radl.rst b/doc/source/radl.rst index 4595e0280..7f17a53f1 100644 --- a/doc/source/radl.rst +++ b/doc/source/radl.rst @@ -302,7 +302,7 @@ machine. The supported features are: * ``one://:/``, for OpenNebula; * ``one://:/``, for OpenNebula; - * ``ost://:/``, for OpenStack; + * ``ost://:/``, for OpenStack or EGI; * ``aws:///``, for Amazon Web Service; * ``aws:///``, for Amazon Web Service; * ``aws:///``, for Amazon Web Service; @@ -311,7 +311,7 @@ machine. The supported features are: * ``azr://///``, for Microsoft Azure; * ``azr://[snapshots|disk]//``, for Microsoft Azure; * ``/``, for FedCloud OCCI connector. - * ``appdb:///?``, for FedCloud OCCI or OpenStack connector using AppDB info (from vers. 1.6.0 and 1.8.6). + * ``appdb:///?``, for FedCloud OCCI, OpenStack or EGI connectors using AppDB info (from vers. 1.6.0 and 1.8.6). * ``docker://``, for Docker images. * ``fbw:///``, for FogBow images. * ``lin://linode/``, for Linode images.