Remainder of renaming changes from savanna to sahara

* .gitignore change for testing config file
* base directory for openstack-common.conf
* change to default test config

Partial-Implements:  blueprint savanna-renaming-dashboard

Change-Id: I39310e2f767ce870752dc15106ac9f06a44dd859
This commit is contained in:
Chad Roberts 2014-03-17 14:17:09 -04:00 committed by Gerrit Code Review
parent ddb58fa8ed
commit ad36e3b0d2
5 changed files with 6 additions and 6 deletions

2
.gitignore vendored
View File

@ -34,5 +34,5 @@ pylint-report.txt
ChangeLog ChangeLog
cscope.out cscope.out
horizon horizon
savannadashboard/tests/configs/config.conf saharadashboard/tests/configs/config.conf
AUTHORS AUTHORS

View File

@ -1,4 +1,4 @@
[DEFAULT] [DEFAULT]
modules=importutils modules=importutils
base=savannadashboard base=saharadashboard

View File

@ -23,7 +23,7 @@ patterns = urls.patterns
url = urls.url url = urls.url
urlpatterns = patterns('savanna.nodegroup_templates.views', urlpatterns = patterns('sahara.nodegroup_templates.views',
url(r'^$', views.NodegroupTemplatesView.as_view(), url(r'^$', views.NodegroupTemplatesView.as_view(),
name='index'), name='index'),
url(r'^nodegroup-templates$', url(r'^nodegroup-templates$',

View File

@ -120,9 +120,9 @@ class UICreateCluster(base.UITestCase):
for x in range(10000))) for x in range(10000)))
self.create_data_source( self.create_data_source(
'input', 'selenium-container.savanna/input') 'input', 'selenium-container.sahara/input')
self.create_data_source( self.create_data_source(
'output', 'selenium-container.savanna/output') 'output', 'selenium-container.sahara/output')
parameters_of_storage = { parameters_of_storage = {
'storage_type': 'Internal database', 'storage_type': 'Internal database',

View File

@ -90,7 +90,7 @@ VanillaGroup = [
"OZ": 3, "TT": 4, "JT": 5}, "OZ": 3, "TT": 4, "JT": 5},
help='numbers of processes for vanilla in saharadashboard'), help='numbers of processes for vanilla in saharadashboard'),
cfg.StrOpt('base_image', cfg.StrOpt('base_image',
default='ubuntu_savanna_latest', default='ubuntu_sahara_latest',
help="image name for start vanilla cluster") help="image name for start vanilla cluster")
] ]