Missed renaming in docs
Some searches were done accidentally as case sensitive, and these few things were missed. Partial-Implements: blueprint savanna-renaming-service Change-Id: Ia93053249fb83d70219b2805269de606758879bf
This commit is contained in:
Trevor McKay
parent
7f5c83e57e
commit
f1e62dd4e2
@ -7,7 +7,7 @@ Architecture
|
||||
:align: left
|
||||
|
||||
|
||||
The Savanna architecture consists of several components:
|
||||
The Sahara architecture consists of several components:
|
||||
|
||||
* Cluster Configuration Manager - all the business logic resides here
|
||||
|
||||
@ -20,8 +20,8 @@ The Savanna architecture consists of several components:
|
||||
* Deployment Engine - pluggable mechanism responsible for deploying Hadoop on provisioned VMs;
|
||||
existing management solutions like Apache Ambari and Cloudera Management Console could be utilized for that matter
|
||||
|
||||
* REST API - exposes Savanna functionality via REST
|
||||
* REST API - exposes Sahara functionality via REST
|
||||
|
||||
* Python Savanna Client - similar to other OpenStack components Savanna has its own python client
|
||||
* Python Sahara Client - similar to other OpenStack components Sahara has its own python client
|
||||
|
||||
* Savanna pages - GUI for the Savanna is located on Horizon
|
||||
* Sahara pages - GUI for the Sahara is located on Horizon
|
||||
|
||||
@ -107,7 +107,7 @@ Save image id. You can get image id from command ``glance image-list``:
|
||||
|
||||
.. sourcecode:: console
|
||||
|
||||
$ export SAVANNA_URL="http://localhost:8386/v1.0/$TENANT_ID"
|
||||
$ export SAHARA_URL="http://localhost:8386/v1.0/$TENANT_ID"
|
||||
|
||||
* Install ``httpie`` REST client
|
||||
|
||||
@ -119,7 +119,7 @@ Save image id. You can get image id from command ``glance image-list``:
|
||||
|
||||
.. sourcecode:: console
|
||||
|
||||
$ http POST $SAVANNA_URL/images/$IMAGE_ID X-Auth-Token:$AUTH_TOKEN \
|
||||
$ http POST $SAHARA_URL/images/$IMAGE_ID X-Auth-Token:$AUTH_TOKEN \
|
||||
username=ubuntu
|
||||
|
||||
|
||||
@ -127,14 +127,14 @@ Save image id. You can get image id from command ``glance image-list``:
|
||||
|
||||
.. sourcecode:: console
|
||||
|
||||
$ http $SAVANNA_URL/images/$IMAGE_ID/tag X-Auth-Token:$AUTH_TOKEN \
|
||||
$ http $SAHARA_URL/images/$IMAGE_ID/tag X-Auth-Token:$AUTH_TOKEN \
|
||||
tags:='["vanilla", "1.2.1", "ubuntu"]'
|
||||
|
||||
* Make sure that image is registered correctly:
|
||||
|
||||
.. sourcecode:: console
|
||||
|
||||
$ http $SAVANNA_URL/images X-Auth-Token:$AUTH_TOKEN
|
||||
$ http $SAHARA_URL/images X-Auth-Token:$AUTH_TOKEN
|
||||
|
||||
* Output should look like:
|
||||
|
||||
@ -204,10 +204,10 @@ Send POST requests to Sahara API to upload NodeGroup templates:
|
||||
|
||||
.. sourcecode:: console
|
||||
|
||||
$ http $SAVANNA_URL/node-group-templates X-Auth-Token:$AUTH_TOKEN \
|
||||
$ http $SAHARA_URL/node-group-templates X-Auth-Token:$AUTH_TOKEN \
|
||||
< ng_master_template_create.json
|
||||
|
||||
$ http $SAVANNA_URL/node-group-templates X-Auth-Token:$AUTH_TOKEN \
|
||||
$ http $SAHARA_URL/node-group-templates X-Auth-Token:$AUTH_TOKEN \
|
||||
< ng_worker_template_create.json
|
||||
|
||||
|
||||
@ -216,7 +216,7 @@ Sahara API:
|
||||
|
||||
.. sourcecode:: console
|
||||
|
||||
$ http $SAVANNA_URL/node-group-templates X-Auth-Token:$AUTH_TOKEN
|
||||
$ http $SAHARA_URL/node-group-templates X-Auth-Token:$AUTH_TOKEN
|
||||
|
||||
Output should look like:
|
||||
|
||||
@ -298,7 +298,7 @@ Send POST request to Sahara API to upload Cluster template:
|
||||
|
||||
.. sourcecode:: console
|
||||
|
||||
$ http $SAVANNA_URL/cluster-templates X-Auth-Token:$AUTH_TOKEN \
|
||||
$ http $SAHARA_URL/cluster-templates X-Auth-Token:$AUTH_TOKEN \
|
||||
< cluster_template_create.json
|
||||
|
||||
Save template id. For example ``ce897df2-1610-4caa-bdb8-408ef90561cf``.
|
||||
@ -332,7 +332,7 @@ Send POST request to Sahara API to create and start the cluster:
|
||||
|
||||
.. sourcecode:: console
|
||||
|
||||
$ http $SAVANNA_URL/clusters X-Auth-Token:$AUTH_TOKEN \
|
||||
$ http $SAHARA_URL/clusters X-Auth-Token:$AUTH_TOKEN \
|
||||
< cluster_create.json
|
||||
|
||||
|
||||
|
||||
@ -77,13 +77,13 @@ and set right value for variables:
|
||||
.. sourcecode:: python
|
||||
|
||||
OPENSTACK_HOST = "ip of your controller"
|
||||
SAVANNA_URL = "url for sahara (e.g. "http://localhost:8386/v1.1")"
|
||||
SAHARA_URL = "url for sahara (e.g. "http://localhost:8386/v1.1")"
|
||||
|
||||
If you are using Neutron instead of Nova Network:
|
||||
|
||||
.. sourcecode:: python
|
||||
|
||||
SAVANNA_USE_NEUTRON = True
|
||||
SAHARA_USE_NEUTRON = True
|
||||
|
||||
If you are not using nova-network with auto_assign_floating_ip=True, also set:
|
||||
|
||||
@ -98,23 +98,23 @@ If you are not using nova-network with auto_assign_floating_ip=True, also set:
|
||||
|
||||
$ git clone https://github.com/openstack/sahara-dashboard.git
|
||||
|
||||
6. Export SAVANNA_DASHBOARD_HOME environment variable with path to sahara-dashboard folder. E.g.:
|
||||
6. Export SAHARA_DASHBOARD_HOME environment variable with path to sahara-dashboard folder. E.g.:
|
||||
|
||||
.. sourcecode:: console
|
||||
|
||||
$ export SAVANNA_DASHBOARD_HOME=$(pwd)/sahara-dashboard
|
||||
$ export SAHARA_DASHBOARD_HOME=$(pwd)/sahara-dashboard
|
||||
|
||||
7. Install sahara-dashboard module to horizon's venv. Go to horizon folder and execute:
|
||||
|
||||
.. sourcecode:: console
|
||||
|
||||
$ .venv/bin/pip install $SAVANNA_DASHBOARD_HOME
|
||||
$ .venv/bin/pip install $SAHARA_DASHBOARD_HOME
|
||||
|
||||
8. Create a symlink to sahara-dashboard source
|
||||
|
||||
.. sourcecode:: console
|
||||
|
||||
$ ln -s $SAVANNA_DASHBOARD_HOME/saharadashboard .venv/lib/python2.7/site-packages/saharadashboard
|
||||
$ ln -s $SAHARA_DASHBOARD_HOME/saharadashboard .venv/lib/python2.7/site-packages/saharadashboard
|
||||
|
||||
9. In ``openstack_dashboard/settings.py`` add sahara to
|
||||
|
||||
@ -152,7 +152,7 @@ It is not recommended to use horizon in this mode for production.
|
||||
|
||||
11. Applying changes
|
||||
|
||||
If you have changed any ``*.py`` files in ``$SAVANNA_DASHBOARD_HOME`` directory,
|
||||
If you have changed any ``*.py`` files in ``$SAHARA_DASHBOARD_HOME`` directory,
|
||||
horizon will notice that and reload automatically.
|
||||
However changes made to non-python files may not be noticed,
|
||||
so you have to restart horizon again manually, as described in step 10.
|
||||
|
||||
@ -63,18 +63,18 @@ approach see :doc:`/horizon/dev.environment.guide`
|
||||
|
||||
Note: ``settings.py`` file is located in ``/usr/share/openstack-dashboard/openstack_dashboard/`` by default.
|
||||
|
||||
3) Also you have to specify **SAVANNA_URL** in local_settings.py. For example:
|
||||
3) Also you have to specify **SAHARA_URL** in local_settings.py. For example:
|
||||
|
||||
.. sourcecode:: python
|
||||
|
||||
SAVANNA_URL = 'http://localhost:8386/v1.1'
|
||||
SAHARA_URL = 'http://localhost:8386/v1.1'
|
||||
..
|
||||
|
||||
If you are using Neutron instead of Nova Network:
|
||||
|
||||
.. sourcecode:: python
|
||||
|
||||
SAVANNA_USE_NEUTRON = True
|
||||
SAHARA_USE_NEUTRON = True
|
||||
..
|
||||
|
||||
If you are not using nova-network with auto_assign_floating_ip=True, also set:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user