← Back to branch summary

~bac/charms/trusty/openstack-dashboard/dashboard-plugin

« back to all changes in this revision

Viewing changes to templates/juno/local_settings.py

  • Committer: Brad Crittenden
  • Date: 2015-10-14 20:13:23 UTC
  • mfrom: (84.1.9 apache-slugs)
  • Revision ID: bac@canonical.com-20151014201323-h4yyijpf4rd1msqc
[r=jcsackett,jrwren] Backport changes from upstream. Add apache_http_addendum and apache_https_addendum to configuration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
templates/juno/local_settings.py
250
250
# in the Keystone service catalog. Use this setting when Horizon is running
251
251
# external to the OpenStack environment. The default is 'publicURL'.
252
252
#OPENSTACK_ENDPOINT_TYPE = "publicURL"
 
253
{% if primary_endpoint -%}
 
254
OPENSTACK_ENDPOINT_TYPE = {{ primary_endpoint }}
 
255
{% endif -%}
253
256
 
254
257
# SECONDARY_ENDPOINT_TYPE specifies the fallback endpoint type to use in the
255
258
# case that OPENSTACK_ENDPOINT_TYPE is not present in the endpoints
257
260
# external to the OpenStack environment. The default is None.  This
258
261
# value should differ from OPENSTACK_ENDPOINT_TYPE if used.
259
262
#SECONDARY_ENDPOINT_TYPE = "publicURL"
 
263
{% if secondary_endpoint -%}
 
264
SECONDARY_ENDPOINT_TYPE = {{ secondary_endpoint }}
 
265
{% endif -%}
260
266
 
261
267
# The number of objects (Swift containers/objects or images) to display
262
268
# on a single page before providing a paging element (a "more" link)
619
625
# installations should have this set accordingly.  For more information
620
626
# see https://docs.djangoproject.com/en/dev/ref/settings/.
621
627
ALLOWED_HOSTS = '*'
 
628
 
 
629
{{ settings|join('\n\n') }}
 
 
b'\\ No newline at end of file'