diff --git a/doc/source/admin/arch.rst b/doc/source/admin/arch.rst index 424f853aa7..47012fbd24 100644 --- a/doc/source/admin/arch.rst +++ b/doc/source/admin/arch.rst @@ -186,52 +186,6 @@ in the OpenStack Configuration Reference. systems can be built within an OpenStack cluster, or provisioned outside of it, but OpenStack software does not provide these features. -EC2 compatibility API -~~~~~~~~~~~~~~~~~~~~~ - -.. todo:: Does this need to be removed now? - -In addition to the native compute API, OpenStack provides an EC2-compatible -API. This API allows EC2 legacy workflows built for EC2 to work with OpenStack. - -.. warning:: - - Nova in tree EC2-compatible API is deprecated. The `ec2-api project - `_ is working to - implement the EC2 API. - -You can use numerous third-party tools and language-specific SDKs to interact -with OpenStack clouds. You can use both native and compatibility APIs. Some of -the more popular third-party tools are: - -Euca2ools - A popular open source command-line tool for interacting with the EC2 API. - This is convenient for multi-cloud environments where EC2 is the common API, - or for transitioning from EC2-based clouds to OpenStack. For more - information, see the `Eucalyptus Documentation - `__. - -Hybridfox - A Firefox browser add-on that provides a graphical interface to many popular - public and private cloud technologies, including OpenStack. For more - information, see the `hybridfox site - `__. - -boto - Python library for interacting with Amazon Web Services. You can use this - library to access OpenStack through the EC2 compatibility API. For more - information, see the `boto project page on GitHub - `__. - -fog - A Ruby cloud services library. It provides methods to interact with a large - number of cloud and virtualization platforms, including OpenStack. For more - information, see the `fog site `__. - -php-opencloud - A PHP SDK designed to work with most OpenStack-based cloud deployments, as - well as Rackspace public cloud. For more information, see the `php-opencloud - site `__. Building blocks ~~~~~~~~~~~~~~~ diff --git a/doc/source/admin/euca2ools.rst b/doc/source/admin/euca2ools.rst deleted file mode 100644 index 3895ac6567..0000000000 --- a/doc/source/admin/euca2ools.rst +++ /dev/null @@ -1,7 +0,0 @@ -================================= -Managing the cloud with euca2ools -================================= - -The ``euca2ools`` command-line tool provides a command line interface to EC2 -API calls. For more information, see the `Official Eucalyptus Documentation -`_. diff --git a/doc/source/admin/index.rst b/doc/source/admin/index.rst index 008c86f67c..7cef714c8c 100644 --- a/doc/source/admin/index.rst +++ b/doc/source/admin/index.rst @@ -21,7 +21,6 @@ operating system, and exposes functionality over a web-based API. configuring-migrations.rst cpu-topologies.rst default-ports.rst - euca2ools.rst evacuate.rst flavors2.rst flavors.rst diff --git a/doc/source/admin/manage-the-cloud.rst b/doc/source/admin/manage-the-cloud.rst index 5a9de36312..fe581b8664 100644 --- a/doc/source/admin/manage-the-cloud.rst +++ b/doc/source/admin/manage-the-cloud.rst @@ -6,14 +6,12 @@ Manage the cloud .. toctree:: - euca2ools.rst common/nova-show-usage-statistics-for-hosts-instances.rst -System administrators can use the :command:`openstack` and :command:`euca2ools` -commands to manage their clouds. +System administrators can use the :command:`openstack` to manage their clouds. -The ``openstack`` client and ``euca2ools`` can be used by all users, though -specific commands might be restricted by the Identity service. +The ``openstack`` client can be used by all users, though specific commands +might be restricted by the Identity service. **Managing the cloud with the openstack client** diff --git a/doc/source/admin/networking-nova.rst b/doc/source/admin/networking-nova.rst index 022ec000ac..53e5b1845b 100644 --- a/doc/source/admin/networking-nova.rst +++ b/doc/source/admin/networking-nova.rst @@ -525,14 +525,12 @@ Enable ping and SSH on VMs ~~~~~~~~~~~~~~~~~~~~~~~~~~ You need to enable ``ping`` and ``ssh`` on your VMs for network access. This -can be done with either the :command:`nova` or :command:`euca2ools` commands. +can be done with the :command:`openstack` command. .. note:: Run these commands as root only if the credentials used to interact with - ``nova-api`` are in ``/root/.bashrc``. If the EC2 credentials in the - ``.bashrc`` file are for an unprivileged user, you must run these commands - as that user instead. + ``nova-api`` are in ``/root/.bashrc``. Enable ping and SSH with :command:`openstack security group rule create` commands: @@ -542,13 +540,6 @@ commands: $ openstack security group rule create --protocol icmp default $ openstack security group rule create --protocol tcp --dst-port 22:22 default -Enable ping and SSH with ``euca2ools``: - -.. code-block:: console - - $ euca-authorize -P icmp -t -1:-1 -s 0.0.0.0/0 default - $ euca-authorize -P tcp -p 22 -s 0.0.0.0/0 default - If you have run these commands and still cannot ping or SSH your instances, check the number of running ``dnsmasq`` processes, there should be two. If not, kill the processes and restart the service with these commands: diff --git a/doc/source/admin/node-down.rst b/doc/source/admin/node-down.rst index f4f27ef854..42717c965f 100644 --- a/doc/source/admin/node-down.rst +++ b/doc/source/admin/node-down.rst @@ -22,15 +22,7 @@ To manually recover a failed compute node: #. Identify the VMs on the affected hosts by using a combination of the :command:`openstack server list` and :command:`openstack server show` - commands or the :command:`euca-describe-instances` command. - - For example, this command displays information about the i-000015b9 instance - that runs on the np-rcc54 node: - - .. code-block:: console - - $ euca-describe-instances - i-000015b9 at3-ui02 running nectarkey (376, np-rcc54) 0 m1.xxlarge 2012-06-19T00:48:11.000Z 115.146.93.60 + commands. #. Query the Compute database for the status of the host. This example converts an EC2 API instance ID to an OpenStack ID. If you use the :command:`nova` @@ -298,24 +290,6 @@ After power resumes and all hardware components restart: This action enables you to connect to the instance without the volume attached, if you allow only connections through public keys. -To script the disaster recovery plan (DRP), use the `https://github.com/Razique -`_ -bash script. - -This script completes these steps: - -#. Creates an array for instances and their attached volumes. - -#. Updates the MySQL database. - -#. Restarts all instances with euca2ools. - -#. Reattaches the volumes. - -#. Uses Compute credentials to make an SSH connection into every instance. - -The script includes a ``test mode``, which enables you to perform the sequence -for only one instance. To reproduce the power loss, connect to the compute node that runs that instance and close the iSCSI session. Do not detach the volume by using the diff --git a/doc/source/admin/system-admin.rst b/doc/source/admin/system-admin.rst index 47147fc8ea..ab79f8a7f8 100644 --- a/doc/source/admin/system-admin.rst +++ b/doc/source/admin/system-admin.rst @@ -38,7 +38,7 @@ responsibilities of services and drivers are: ``nova-api`` Receives XML requests and sends them to the rest of the system. A WSGI app - routes and authenticates requests. Supports the EC2 and OpenStack APIs. A + routes and authenticates requests. Supports the OpenStack Compute APIs. A ``nova.conf`` configuration file is created when Compute is installed. ``nova-cert`` diff --git a/doc/source/cli/nova-api.rst b/doc/source/cli/nova-api.rst index 8589044afe..972f20264f 100644 --- a/doc/source/cli/nova-api.rst +++ b/doc/source/cli/nova-api.rst @@ -2,9 +2,9 @@ nova-api ======== -------------------------------------------- -Server for the Nova EC2 and OpenStack APIs -------------------------------------------- +------------------------------------- +Server for the OpenStack Compute APIs +------------------------------------- :Author: openstack@lists.openstack.org :Date: 2012-09-27 diff --git a/doc/source/install/get-started-compute.rst b/doc/source/install/get-started-compute.rst index 349e1891b1..87ee51d0ae 100644 --- a/doc/source/install/get-started-compute.rst +++ b/doc/source/install/get-started-compute.rst @@ -18,10 +18,10 @@ download images to launch instances. OpenStack Compute consists of the following areas and their components: ``nova-api`` service + Accepts and responds to end user compute API calls. The service supports the - OpenStack Compute API, the Amazon EC2 API, and a special Admin API for - privileged users to perform administrative actions. It enforces some policies - and initiates most orchestration activities, such as running an instance. + OpenStack Compute API. It enforces some policies and initiates most + orchestration activities, such as running an instance. ``nova-api-metadata`` service Accepts metadata requests from instances. The ``nova-api-metadata`` service diff --git a/doc/source/reference/rpc.rst b/doc/source/reference/rpc.rst index adf51167db..6d18bb5fc0 100644 --- a/doc/source/reference/rpc.rst +++ b/doc/source/reference/rpc.rst @@ -49,9 +49,9 @@ initialization time, one which accepts messages with routing keys ``NODE-TYPE.NODE-ID`` (for example ``compute.hostname``) and another, which accepts messages with routing keys as generic ``NODE-TYPE`` (for example ``compute``). The former is used specifically when Nova-API needs to redirect -commands to a specific node like ``euca-terminate instance``. In this case, -only the compute node whose host's hypervisor is running the virtual machine -can kill the instance. The API acts as a consumer when RPC calls are +commands to a specific node like ``openstack server delete $instance``. In this +case, only the compute node whose host's hypervisor is running the virtual +machine can kill the instance. The API acts as a consumer when RPC calls are request/response, otherwise it acts as a publisher only. Nova RPC Mappings