summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Tomasek <jtomasek@redhat.com>2015-04-16 13:40:37 +0200
committerJiri Tomasek <jtomasek@redhat.com>2015-04-16 13:40:37 +0200
commit4c6c4309d746722ff7dbcd7f30aab0299bc2129e (patch)
treed405e1b8cd9dcc48681695c82a64bf0a45667b31
parent0006a339b7627ce53edf6cf0d6614f4e8cc60000 (diff)
downloadtuskar-ui-4c6c4309d746722ff7dbcd7f30aab0299bc2129e.tar.gz
Update roles in Service config
Change-Id: I6a080fe505780f4f501498abd29bfdfffb01558a
-rw-r--r--tuskar_ui/infrastructure/parameters/forms.py11
-rw-r--r--tuskar_ui/infrastructure/parameters/templates/parameters/advanced_service_config.html6
-rw-r--r--tuskar_ui/infrastructure/parameters/templates/parameters/index.html6
3 files changed, 19 insertions, 4 deletions
diff --git a/tuskar_ui/infrastructure/parameters/forms.py b/tuskar_ui/infrastructure/parameters/forms.py
index 1992785c..cefba145 100644
--- a/tuskar_ui/infrastructure/parameters/forms.py
+++ b/tuskar_ui/infrastructure/parameters/forms.py
@@ -103,16 +103,19 @@ class ServiceConfig(horizon.forms.SelfHandlingForm):
return tuskar_ui.forms.fieldset(self, prefix='^(?!.*::)')
def controller_fieldset(self):
- return tuskar_ui.forms.fieldset(self, prefix='controller-1')
+ return tuskar_ui.forms.fieldset(self, prefix='Controller-1')
def compute_fieldset(self):
- return tuskar_ui.forms.fieldset(self, prefix='compute-1')
+ return tuskar_ui.forms.fieldset(self, prefix='Compute-1')
def block_storage_fieldset(self):
- return tuskar_ui.forms.fieldset(self, prefix='cinder-storage-1')
+ return tuskar_ui.forms.fieldset(self, prefix='Cinder-Storage-1')
def object_storage_fieldset(self):
- return tuskar_ui.forms.fieldset(self, prefix='swift-storage-1')
+ return tuskar_ui.forms.fieldset(self, prefix='Swift-Storage-1')
+
+ def ceph_storage_fieldset(self):
+ return tuskar_ui.forms.fieldset(self, prefix='Ceph-Storage-1')
def handle():
pass
diff --git a/tuskar_ui/infrastructure/parameters/templates/parameters/advanced_service_config.html b/tuskar_ui/infrastructure/parameters/templates/parameters/advanced_service_config.html
index f291d59d..9f9955be 100644
--- a/tuskar_ui/infrastructure/parameters/templates/parameters/advanced_service_config.html
+++ b/tuskar_ui/infrastructure/parameters/templates/parameters/advanced_service_config.html
@@ -34,6 +34,7 @@
<li><a href="#compute" role="tab" data-toggle="tab">{% trans "Compute" %}</a></li>
<li><a href="#block-storage" role="tab" data-toggle="tab">{% trans "Block Storage" %}</a></li>
<li><a href="#object-storage" role="tab" data-toggle="tab">{% trans "Object Storage" %}</a></li>
+ <li><a href="#ceph-storage" role="tab" data-toggle="tab">{% trans "Ceph Storage" %}</a></li>
</ul>
</div>
<div class="col-md-10">
@@ -63,6 +64,11 @@
{% include 'horizon/common/_horizontal_field.html' with field=field %}
{% endfor %}
</div>
+ <div class="tab-pane" id="ceph-storage">
+ {% for field in form.ceph_storage_fieldset %}
+ {% include 'horizon/common/_horizontal_field.html' with field=field %}
+ {% endfor %}
+ </div>
</div>
</div>
</form>
diff --git a/tuskar_ui/infrastructure/parameters/templates/parameters/index.html b/tuskar_ui/infrastructure/parameters/templates/parameters/index.html
index 6c8d8307..1671e707 100644
--- a/tuskar_ui/infrastructure/parameters/templates/parameters/index.html
+++ b/tuskar_ui/infrastructure/parameters/templates/parameters/index.html
@@ -18,6 +18,7 @@
<li><a href="#compute" role="tab" data-toggle="tab">{% trans "Compute" %}</a></li>
<li><a href="#block-storage" role="tab" data-toggle="tab">{% trans "Block Storage" %}</a></li>
<li><a href="#object-storage" role="tab" data-toggle="tab">{% trans "Object Storage" %}</a></li>
+ <li><a href="#ceph-storage" role="tab" data-toggle="tab">{% trans "Ceph Storage" %}</a></li>
</ul>
</div>
<div class="col-md-10">
@@ -47,6 +48,11 @@
{% include 'horizon/common/_horizontal_field.html' with field=field %}
{% endfor %}
</div>
+ <div class="tab-pane" id="ceph-storage">
+ {% for field in form.ceph_storage_fieldset %}
+ {% include 'horizon/common/_horizontal_field.html' with field=field %}
+ {% endfor %}
+ </div>
</div>
</div>
</form>