diff --git a/HACKING.rst b/HACKING.rst index a9465609..a85ef294 100644 --- a/HACKING.rst +++ b/HACKING.rst @@ -5,7 +5,7 @@ Sahara Style Commandments http://docs.openstack.org/developer/hacking/ - Step 2: Read on -Savanna Specific Commandments +Sahara Specific Commandments ----------------------------- None so far diff --git a/saharadashboard/dashboard.py b/saharadashboard/dashboard.py index dad913aa..22086011 100644 --- a/saharadashboard/dashboard.py +++ b/saharadashboard/dashboard.py @@ -42,5 +42,5 @@ class SaharaDashboard(horizon.Dashboard): horizon.register(SaharaDashboard) -LOG.info('Savanna recognizes Dashboard release as "%s"' % +LOG.info('Sahara recognizes Dashboard release as "%s"' % compatibility.get_dashboard_release()) diff --git a/saharadashboard/job_binaries/forms.py b/saharadashboard/job_binaries/forms.py index bf538ad3..e0c33c23 100644 --- a/saharadashboard/job_binaries/forms.py +++ b/saharadashboard/job_binaries/forms.py @@ -59,7 +59,7 @@ class JobBinaryCreateForm(forms.SelfHandlingForm): job_binary_url = forms.CharField(label=_("URL"), required=False, widget=LabeledInput()) - job_binary_savanna_internal = forms.ChoiceField(label=_("Savanna binary"), + job_binary_savanna_internal = forms.ChoiceField(label=_("Internal binary"), required=False) job_binary_file = forms.FileField(label=_("Upload File"), @@ -90,7 +90,7 @@ class JobBinaryCreateForm(forms.SelfHandlingForm): self.help_text_template = "job_binaries/_create_job_binary_help.html" self.fields["job_binary_type"].choices =\ - [("savanna-db", "Savanna internal database"), + [("savanna-db", "Internal database"), ("swift", "Swift")] self.fields["job_binary_savanna_internal"].choices =\ diff --git a/saharadashboard/templates/cluster_templates/cluster_templates.html b/saharadashboard/templates/cluster_templates/cluster_templates.html index d0e69c20..ffac6d1e 100644 --- a/saharadashboard/templates/cluster_templates/cluster_templates.html +++ b/saharadashboard/templates/cluster_templates/cluster_templates.html @@ -1,9 +1,9 @@ {% extends 'base.html' %} {% load i18n %} -{% block title %}{% trans "Savanna" %}{% endblock %} +{% block title %}{% trans "Sahara" %}{% endblock %} {% block page_header %} - {% include "horizon/common/_page_header.html" with title=_("Savanna - Cluster Templates") %} + {% include "horizon/common/_page_header.html" with title=_("Sahara - Cluster Templates") %} {% endblock page_header %} {% block main %} diff --git a/saharadashboard/templates/cluster_templates/configure.html b/saharadashboard/templates/cluster_templates/configure.html index 531b9247..5abb8ebd 100644 --- a/saharadashboard/templates/cluster_templates/configure.html +++ b/saharadashboard/templates/cluster_templates/configure.html @@ -3,7 +3,7 @@ {% block title %}{% trans "Create Cluster Template" %}{% endblock %} {% block page_header %} - {% include "horizon/common/_page_header.html" with title=_("Savanna - Create Cluster Template") %} + {% include "horizon/common/_page_header.html" with title=_("Sahara - Create Cluster Template") %} {% endblock page_header %} {% block main %} diff --git a/saharadashboard/templates/cluster_templates/create.html b/saharadashboard/templates/cluster_templates/create.html index 531b9247..5abb8ebd 100644 --- a/saharadashboard/templates/cluster_templates/create.html +++ b/saharadashboard/templates/cluster_templates/create.html @@ -3,7 +3,7 @@ {% block title %}{% trans "Create Cluster Template" %}{% endblock %} {% block page_header %} - {% include "horizon/common/_page_header.html" with title=_("Savanna - Create Cluster Template") %} + {% include "horizon/common/_page_header.html" with title=_("Sahara - Create Cluster Template") %} {% endblock page_header %} {% block main %} diff --git a/saharadashboard/templates/cluster_templates/details.html b/saharadashboard/templates/cluster_templates/details.html index 8cba7464..b245f17f 100644 --- a/saharadashboard/templates/cluster_templates/details.html +++ b/saharadashboard/templates/cluster_templates/details.html @@ -3,7 +3,7 @@ {% block title %}{% trans "Cluster Template Details" %}{% endblock %} {% block page_header %} - {% include "horizon/common/_page_header.html" with title=_("Savanna - Cluster Template Details") %} + {% include "horizon/common/_page_header.html" with title=_("Sahara - Cluster Template Details") %} {% endblock page_header %} {% block main %} diff --git a/saharadashboard/templates/clusters/clusters.html b/saharadashboard/templates/clusters/clusters.html index fdcea1b1..cca9f36c 100644 --- a/saharadashboard/templates/clusters/clusters.html +++ b/saharadashboard/templates/clusters/clusters.html @@ -1,9 +1,9 @@ {% extends 'base.html' %} {% load i18n %} -{% block title %}{% trans "Savanna" %}{% endblock %} +{% block title %}{% trans "Sahara" %}{% endblock %} {% block page_header %} - {% include "horizon/common/_page_header.html" with title=_("Savanna - Clusters") %} + {% include "horizon/common/_page_header.html" with title=_("Sahara - Clusters") %} {% endblock page_header %} {% block main %} diff --git a/saharadashboard/templates/clusters/configure.html b/saharadashboard/templates/clusters/configure.html index d2c5d364..4a012556 100644 --- a/saharadashboard/templates/clusters/configure.html +++ b/saharadashboard/templates/clusters/configure.html @@ -3,7 +3,7 @@ {% block title %}{% trans "Launch Cluster" %}{% endblock %} {% block page_header %} - {% include "horizon/common/_page_header.html" with title=_("Savanna - Launch Cluster") %} + {% include "horizon/common/_page_header.html" with title=_("Sahara - Launch Cluster") %} {% endblock page_header %} {% block main %} diff --git a/saharadashboard/templates/clusters/create.html b/saharadashboard/templates/clusters/create.html index d2c5d364..4a012556 100644 --- a/saharadashboard/templates/clusters/create.html +++ b/saharadashboard/templates/clusters/create.html @@ -3,7 +3,7 @@ {% block title %}{% trans "Launch Cluster" %}{% endblock %} {% block page_header %} - {% include "horizon/common/_page_header.html" with title=_("Savanna - Launch Cluster") %} + {% include "horizon/common/_page_header.html" with title=_("Sahara - Launch Cluster") %} {% endblock page_header %} {% block main %} diff --git a/saharadashboard/templates/clusters/details.html b/saharadashboard/templates/clusters/details.html index aa9f4144..e89e8b21 100644 --- a/saharadashboard/templates/clusters/details.html +++ b/saharadashboard/templates/clusters/details.html @@ -3,7 +3,7 @@ {% block title %}{% trans "Cluster Details" %}{% endblock %} {% block page_header %} - {% include "horizon/common/_page_header.html" with title=_("Savanna - Cluster Details") %} + {% include "horizon/common/_page_header.html" with title=_("Sahara - Cluster Details") %} {% endblock page_header %} {% block main %} diff --git a/saharadashboard/templates/clusters/scale.html b/saharadashboard/templates/clusters/scale.html index e526decc..e3de6c46 100644 --- a/saharadashboard/templates/clusters/scale.html +++ b/saharadashboard/templates/clusters/scale.html @@ -3,7 +3,7 @@ {% block title %}{% trans "Scale Cluster" %}{% endblock %} {% block page_header %} - {% include "horizon/common/_page_header.html" with title=_("Savanna - Scale Cluster") %} + {% include "horizon/common/_page_header.html" with title=_("Sahara - Scale Cluster") %} {% endblock page_header %} {% block main %} diff --git a/saharadashboard/templates/data_sources/create.html b/saharadashboard/templates/data_sources/create.html index 3f9c2053..cbd6663d 100644 --- a/saharadashboard/templates/data_sources/create.html +++ b/saharadashboard/templates/data_sources/create.html @@ -3,7 +3,7 @@ {% block title %}{% trans "Create Data Source" %}{% endblock %} {% block page_header %} - {% include "horizon/common/_page_header.html" with title=_("Savanna - Create Data Source") %} + {% include "horizon/common/_page_header.html" with title=_("Sahara - Create Data Source") %} {% endblock page_header %} {% block main %} diff --git a/saharadashboard/templates/data_sources/data_sources.html b/saharadashboard/templates/data_sources/data_sources.html index b6faadfb..e0c47ff3 100644 --- a/saharadashboard/templates/data_sources/data_sources.html +++ b/saharadashboard/templates/data_sources/data_sources.html @@ -1,9 +1,9 @@ {% extends 'base.html' %} {% load i18n %} -{% block title %}{% trans "Savanna" %}{% endblock %} +{% block title %}{% trans "Sahara" %}{% endblock %} {% block page_header %} - {% include "horizon/common/_page_header.html" with title=_("Savanna - Data Sources") %} + {% include "horizon/common/_page_header.html" with title=_("Sahara - Data Sources") %} {% endblock page_header %} {% block main %} diff --git a/saharadashboard/templates/data_sources/details.html b/saharadashboard/templates/data_sources/details.html index ea0cca3d..78cc4e26 100644 --- a/saharadashboard/templates/data_sources/details.html +++ b/saharadashboard/templates/data_sources/details.html @@ -3,7 +3,7 @@ {% block title %}{% trans "Data Source Details" %}{% endblock %} {% block page_header %} - {% include "horizon/common/_page_header.html" with title=_("Savanna - Data Source Details") %} + {% include "horizon/common/_page_header.html" with title=_("Sahara - Data Source Details") %} {% endblock page_header %} {% block main %} diff --git a/saharadashboard/templates/image_registry/_help.html b/saharadashboard/templates/image_registry/_help.html index 47ca941f..c55ff068 100644 --- a/saharadashboard/templates/image_registry/_help.html +++ b/saharadashboard/templates/image_registry/_help.html @@ -2,10 +2,10 @@

Image Registry tool:


- Image Registry is used to provide additional information about images for Savanna + Image Registry is used to provide additional information about images for Sahara

- Specified username will be used by Savanna to apply configs and manage processes on instances. + Specified username will be used by Sahara to apply configs and manage processes on instances.

Tags are used for filtering images suitable for each plugin and each hadoop version. diff --git a/saharadashboard/templates/image_registry/image_registry.html b/saharadashboard/templates/image_registry/image_registry.html index 44532334..2123b6de 100644 --- a/saharadashboard/templates/image_registry/image_registry.html +++ b/saharadashboard/templates/image_registry/image_registry.html @@ -1,9 +1,9 @@ {% extends 'base.html' %} {% load i18n %} -{% block title %}{% trans "Savanna" %}{% endblock %} +{% block title %}{% trans "Sahara" %}{% endblock %} {% block page_header %} - {% include "horizon/common/_page_header.html" with title=_("Savanna - Image Registry") %} + {% include "horizon/common/_page_header.html" with title=_("Sahara - Image Registry") %} {% endblock page_header %} {% block main %} diff --git a/saharadashboard/templates/job_binaries/_create_job_binary_help.html b/saharadashboard/templates/job_binaries/_create_job_binary_help.html index 17bf6478..0d1e4c85 100644 --- a/saharadashboard/templates/job_binaries/_create_job_binary_help.html +++ b/saharadashboard/templates/job_binaries/_create_job_binary_help.html @@ -6,12 +6,12 @@

Select the storage type for your Job Binary.

- For Savanna internal job binaries, you may choose from the following: + For Sahara internal job binaries, you may choose from the following: