From: Michal Fojtik <[email protected]>
Signed-off-by: Michal fojtik <[email protected]> --- site/content/_credentials.haml | 16 ++++++ site/content/_drivers.mdown | 57 +++++++++++++++++---- site/lib/provider_support.rb | 9 ++- site/output/drivers.html | 111 +++++++++++++++++++++++++++++++++------- site/output/index.html | 15 +++++- 5 files changed, 176 insertions(+), 32 deletions(-) diff --git a/site/content/_credentials.haml b/site/content/_credentials.haml index cd36d1a..3f2b887 100644 --- a/site/content/_credentials.haml +++ b/site/content/_credentials.haml @@ -172,3 +172,19 @@ filter: %td Password %td + %tr + %td + %strong VMware vSphere + %td + %tt vsphere + %td vSphere user + %td vSphere user password + %td Set environment variable API_PROVIDER to the hostname of the vSphere server + %tr + %td + %strong OpenStack + %td + %tt openstack + %td OpenStack user + %td OpenStack user password + %td Set environment variable API_PROVIDER to the URL of OpenStack API entrypoint diff --git a/site/content/_drivers.mdown b/site/content/_drivers.mdown index 0fb5112..4f81e00 100644 --- a/site/content/_drivers.mdown +++ b/site/content/_drivers.mdown @@ -82,16 +82,53 @@ that installation by passing the request headers ### RHEV-M Driver -The RHEV-M driver needs to be installed on a Windows machine which has the -RHEV-M Powershell API installed and configured. Assuming the directory -structure above is followed, you should copy the file -deltacloud/deltacloud-driver-rhevm/config/rhevm_config.yaml.EXAMPLE to be -rhevm_config.yaml and edit the file woith the domain you are logging into. -The username and pasword is provided via the API. - -The actual RHEVM instance you are connecting to is controlled by -the RHEVM.dll.config file which is referenced from the profile.ps1 -file located in My Documents/WindowsPowershell directory +The RHEV-M driver supports latest release of <a href="http://www.redhat.com/virtualization/rhev/server/"; +target="_blank">Red Hat Enterprise Virtualization Manager</a> (3.0 currently). +In order to make the driver work with this provider, you need to set an/the +API_PROVIDER environment variable or use the 'X-Deltacloud-Provider' request +header to the URL of the RHEV-M REST API entry point. The usual URL looks like: + + API_PROVIDER="https://rhevm.hostname.com:8443/rhevm-api;645e425e-66fe-4ac9-8874-537bd10ef08d"; + +Note: To make sure that you have right credentials, you can try to access +<a href="">https://rhevm.hostname.com:8443/rhevm-api</a> in your browser. +If you're able to authenticate within the browser, then the crendentials you used +are valid Deltacloud credentials. + +Note: In order to make RHEV-M driver work properly, you need to set the RHEV-M +<a href="http://markmc.fedorapeople.org/rhevm-api/en-US/html-single/index.html#chap-REST_API_Guide-Data_Centers"; +target="_blank">Data Center</a> UUID you want to speak with in API_PROVIDER url (see the example +above). To obtain a list of all Data Centers you can choose from, start Deltacloud API without +specifying a datacenter in the API_PROVIDER URL and do this request: + + GET /api/drivers/rhevm?format=xml + +The list of possible datacenters will appear in the 'providers' section. + +------------------------------------------------ + +### VMware vSphere Driver + +For details on how to make the VMware vSphere driver work with Deltacloud API, +please refer to <a href="https://www.aeolusproject.org/redmine/projects/aeolus/wiki/VSphere_Setup"; +target="_blank">vSphere Setup</a> in Aeolus project wiki. + +In order to connect to vSphere, you need to set the API_PROVIDER environment +variable or use the 'X-Deltacloud-Provider' HTTP header in the request to the vSphere +host you want to use. Example: + + API_PROVIDER="vsphere.hostname.com" + +The username and password in 401 challenge should be (your???) the same as in vSphere Control +Center in the vSphere box(clen nechat, ak sa boxom mysli nejaky checkbox, a nepatri to k nazvu). + +------------------------------------------------ + +### OpenStack Driver + +To connect to OpenStack API, you will need to set the API_provider environment +variable or the 'X-Deltacloud-Provider' HTTP header to a valid OpenStack API +entrypoint. ------------------------------------------------ diff --git a/site/lib/provider_support.rb b/site/lib/provider_support.rb index 9715716..e6154b8 100644 --- a/site/lib/provider_support.rb +++ b/site/lib/provider_support.rb @@ -19,8 +19,10 @@ module ProviderSupportHelper :list => { :hardware_profiles => true, :realms => true, :images => true, :instances => true} }, {:name => "Terremark", :driver => true, :instance => { :create => true, :start => true, :stop => true, :reboot => true, :destroy => true }, :list => { :hardware_profiles => true, :realms => true, :images => true, :instances => true} }, - {:name => "vSphere", :driver => false, :instance => { :create => true, :start => true, :stop => true, :reboot => true, :destroy => true }, + {:name => "vSphere", :driver => true, :instance => { :create => true, :start => true, :stop => true, :reboot => true, :destroy => true }, :list => { :hardware_profiles => true, :realms => true, :images => true, :instances => true} }, + {:name => "OpenStack", :driver => true, :instance => { :create => true, :start => true, :stop => true, :reboot => true, :destroy => true }, + :list => { :hardware_profiles => true, :realms => true, :images => true, :instances => true} } ] end @@ -42,8 +44,9 @@ module ProviderSupportHelper :container => { :create => true, :update => true }, :blob => { :create => true, :update => true, :rw => true, :rw_attr => true } }, - { :name => "Google Storage", :driver => false, - :container => { }, :blob => { } }, + { :name => "Google Storage", :driver => true, + :blob => { :create => true, :update => true, :rw => true, + :rw_attr => true } }, ] end diff --git a/site/output/drivers.html b/site/output/drivers.html index 77502fa..d123697 100644 --- a/site/output/drivers.html +++ b/site/output/drivers.html @@ -99,16 +99,22 @@ <a href="#h3_3">RHEV-M Driver</a> </li> <li> - <a href="#h3_4">Rackspace Driver</a> + <a href="#h3_4">VMware vSphere Driver</a> </li> <li> - <a href="#h3_5">RimuHosting</a> + <a href="#h3_5">OpenStack Driver</a> </li> <li> - <a href="#h3_6">OpenNebula</a> + <a href="#h3_6">Rackspace Driver</a> </li> <li> - <a href="#h3_7">IBM Smartcloud Driver</a> + <a href="#h3_7">RimuHosting</a> + </li> + <li> + <a href="#h3_8">OpenNebula</a> + </li> + <li> + <a href="#h3_9">IBM Smartcloud Driver</a> </li> </ul></li></ul> <!-- = rest --> @@ -331,7 +337,20 @@ <tr> <td class='provider'> vSphere - <span>coming soon</span> + </td> + <td class="supported">yes</td> + <td class="supported">yes</td> + <td class="supported">yes</td> + <td class="supported">yes</td> + <td class="supported">yes</td> + <td class="supported">yes</td> + <td class="supported">yes</td> + <td class="supported">yes</td> + <td class="supported">yes</td> + </tr> + <tr> + <td class='provider'> + OpenStack </td> <td class="supported">yes</td> <td class="supported">yes</td> @@ -673,6 +692,28 @@ </td> <td></td> </tr> + <tr> + <td> + <strong>VMware vSphere</strong> + </td> + <td> + <tt>vsphere</tt> + </td> + <td>vSphere user</td> + <td>vSphere user password</td> + <td>Set environment variable API_PROVIDER to the hostname of the vSphere server</td> + </tr> + <tr> + <td> + <strong>OpenStack</strong> + </td> + <td> + <tt>openstack</tt> + </td> + <td>OpenStack user</td> + <td>OpenStack user password</td> + <td>Set environment variable API_PROVIDER to the URL of OpenStack API entrypoint</td> + </tr> </table> @@ -711,20 +752,54 @@ <h3 id="h3_3">RHEV-M Driver</h3> - <p>The RHEV-M driver needs to be installed on a Windows machine which has the - RHEV-M Powershell API installed and configured. Assuming the directory - structure above is followed, you should copy the file - deltacloud/deltacloud-driver-rhevm/config/rhevm_config.yaml.EXAMPLE to be - rhevm_config.yaml and edit the file woith the domain you are logging into. - The username and pasword is provided via the API.</p> + <p>The RHEV-M driver supports latest release of <a href="http://www.redhat.com/virtualization/rhev/server/"; target="_blank">Red Hat Enterprise Virtualization Manager</a> (3.0 currently). + In order to make the driver work with this provider, you need to set an/the + API_PROVIDER environment variable or use the 'X-Deltacloud-Provider' request + header to the URL of the RHEV-M REST API entry point. The usual URL looks like:</p> + + <pre><code>API_PROVIDER="https://rhevm.hostname.com:8443/rhevm-api;645e425e-66fe-4ac9-8874-537bd10ef08d"; 
</code></pre> + + <p>Note: To make sure that you have right credentials, you can try to access + <a href="">https://rhevm.hostname.com:8443/rhevm-api</a> in your browser. + If you're able to authenticate within the browser, then the crendentials you used + are valid Deltacloud credentials.</p> + + <p>Note: In order to make RHEV-M driver work properly, you need to set the RHEV-M + <a href="http://markmc.fedorapeople.org/rhevm-api/en-US/html-single/index.html#chap-REST_API_Guide-Data_Centers"; target="_blank">Data Center</a> UUID you want to speak with in API_PROVIDER url (see the example + above). To obtain a list of all Data Centers you can choose from, start Deltacloud API without + specifying a datacenter in the API_PROVIDER URL and do this request:</p> + + <pre><code>GET /api/drivers/rhevm?format=xml
</code></pre> + + <p>The list of possible datacenters will appear in the 'providers' section.</p> + + <hr /> + + <h3 id="h3_4">VMware vSphere Driver</h3> + + <p>For details on how to make the VMware vSphere driver work with Deltacloud API, + please refer to <a href="https://www.aeolusproject.org/redmine/projects/aeolus/wiki/VSphere_Setup"; target="_blank">vSphere Setup</a> in Aeolus project wiki.</p> + + <p>In order to connect to vSphere, you need to set the API_PROVIDER environment + variable or use the 'X-Deltacloud-Provider' HTTP header in the request to the vSphere + host you want to use. Example:</p> + + <pre><code>API_PROVIDER="vsphere.hostname.com"
</code></pre> + + <p>The username and password in 401 challenge should be (your???) the same as in vSphere Control + Center in the vSphere box(clen nechat, ak sa boxom mysli nejaky checkbox, a nepatri to k nazvu).</p> + + <hr /> + + <h3 id="h3_5">OpenStack Driver</h3> - <p>The actual RHEVM instance you are connecting to is controlled by - the RHEVM.dll.config file which is referenced from the profile.ps1 - file located in My Documents/WindowsPowershell directory</p> + <p>To connect to OpenStack API, you will need to set the API_provider environment + variable or the 'X-Deltacloud-Provider' HTTP header to a valid OpenStack API + entrypoint.</p> <hr /> - <h3 id="h3_4">Rackspace Driver</h3> + <h3 id="h3_6">Rackspace Driver</h3> <p>When using the Rackspace-cloud driver (Rackspace cloud used to be called "Mosso") - the password in a HTTP 401 challenge should be your API key, NOT @@ -733,13 +808,13 @@ <hr /> - <h3 id="h3_5">RimuHosting</h3> + <h3 id="h3_7">RimuHosting</h3> <p>Further details coming soon.</p> <hr /> - <h3 id="h3_6">OpenNebula</h3> + <h3 id="h3_8">OpenNebula</h3> <p>When using the <a href="http://www.opennebula.org/";>OpenNebula</a> driver, the credentials passed in response to the HTTP 401 authentication challenge @@ -750,7 +825,7 @@ <hr /> - <h3 id="h3_7">IBM Smartcloud Driver</h3> + <h3 id="h3_9">IBM Smartcloud Driver</h3> <p>When using the IBM SmartCloud driver, the credentials passed in response to the HTTP 401 authentication challenge should be your IBM SmartCloud diff --git a/site/output/index.html b/site/output/index.html index 732991d..33991d0 100644 --- a/site/output/index.html +++ b/site/output/index.html @@ -299,7 +299,20 @@ <tr> <td class='provider'> vSphere - <span>coming soon</span> + </td> + <td class="supported">yes</td> + <td class="supported">yes</td> + <td class="supported">yes</td> + <td class="supported">yes</td> + <td class="supported">yes</td> + <td class="supported">yes</td> + <td class="supported">yes</td> + <td class="supported">yes</td> + <td class="supported">yes</td> + </tr> + <tr> + <td class='provider'> + OpenStack </td> <td class="supported">yes</td> <td class="supported">yes</td> -- 1.7.4.4
