Cluster details page should list all endpoints

Currently only one endpoint is shown in the cluster details tab.
Instead, this should be a comma-separated list.

Make the appropriate change to the MongoDB and redis templates.

Change-Id: I85c67119174e576134862e7d971b6b9df3f674ac
Closes-bug: #1554623
This commit is contained in:
Matt Van Dijk 2016-03-08 12:29:11 -05:00 committed by mariam john
parent 7ff6706b09
commit b510b4e76c
3 changed files with 12 additions and 11 deletions

View File

@ -0,0 +1,4 @@
---
fixes:
- Display all endpoints in the dashboard's cluster
details endpoint list.

View File

@ -7,18 +7,15 @@
<dl> <dl>
{% with cluster.ip.0 as ip %} {% with cluster.ip.0 as ip %}
<dt>{% trans "Host" %}</dt> <dt>{% trans "Host" %}</dt>
<dd>
{% if not ip %} {% if not ip %}
{% trans "Not Assigned" %} <dd>{% trans "Not Assigned" %}</dd>
</dd>
{% else %} {% else %}
{{ ip }} <dd>{{ cluster.ip|join:', ' }}</dd>
</dd> <dt>{% trans "Database Port" %}</dt>
<dt>{% trans "Database Port" %}</dt> <dd>27017</dd>
<dd>27017</dd> <dt>{% trans "Connection Examples" %}</dt>
<dt>{% trans "Connection Examples" %}</dt> <dd>mongo --host {{ ip }}</dd>
<dd>mongo --host {{ ip }}</dd> <dd>mongodb://[{% trans "USERNAME" %}:{% trans "PASSWORD" %}@]{{ ip }}:27017/{% trans "DATABASE" %}</dd>
<dd>mongodb://[{% trans "USERNAME" %}:{% trans "PASSWORD" %}@]{{ ip }}:27017/{% trans "DATABASE" %}</dd>
{% endif %} <!-- ends else block --> {% endif %} <!-- ends else block -->
{% endwith %} {% endwith %}
</dl> </dl>

View File

@ -10,7 +10,7 @@
{% if not ip %} {% if not ip %}
<dd>{% trans "Not Assigned" %}</dd> <dd>{% trans "Not Assigned" %}</dd>
{% else %} {% else %}
<dd>{{ ip }}</dd> <dd>{{ cluster.ip|join:', ' }}</dd>
<dt>{% trans "Connection Examples" %}</dt> <dt>{% trans "Connection Examples" %}</dt>
<dd>redis-cli -h {{ ip }}</dd> <dd>redis-cli -h {{ ip }}</dd>
{% endif %} <!-- ends else block --> {% endif %} <!-- ends else block -->