← Back to branch summary

~brad-marshall/charms/trusty/openstack-dashboard/fix-hacluster-config

« back to all changes in this revision

Viewing changes to hooks/horizon_utils.py

  • Committer: james.page at ubuntu
  • Date: 2014-05-21 10:06:19 UTC
  • mfrom: (27.2.1 openstack-dashboard)
  • Revision ID: james.page@ubuntu.com-20140521100619-juiqzld0e0yrsvw3
[tribaal,r=james-page,t=james-page]

Resync helpers to pickup fixes for apt lock races and better block device detection and handling.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/horizon_utils.py
33
33
LOCAL_SETTINGS = "/etc/openstack-dashboard/local_settings.py"
34
34
HAPROXY_CONF = "/etc/haproxy/haproxy.cfg"
35
35
APACHE_CONF = "%s/conf.d/openstack-dashboard.conf" % (APACHE_CONF_DIR)
36
 
APACHE_24_CONF = "%s/conf-available/openstack-dashboard.conf" % (APACHE_CONF_DIR)
 
36
APACHE_24_CONF = "%s/conf-available/openstack-dashboard.conf" \
 
37
    % (APACHE_CONF_DIR)
37
38
PORTS_CONF = "%s/ports.conf" % (APACHE_CONF_DIR)
38
39
APACHE_24_SSL = "%s/sites-available/default-ssl.conf" % (APACHE_CONF_DIR)
39
40
APACHE_24_DEFAULT = "%s/sites-available/000-default.conf" % (APACHE_CONF_DIR)
87
88
    }),
88
89
])
89
90
 
 
91
 
90
92
def register_configs():
91
93
    ''' Register config files with their respective contexts. '''
92
94
    release = get_os_codename_package('openstack-dashboard', fatal=False) or \