← Back to branch summary

~openstack-charmers-archive/charms/trusty/openstack-dashboard/next

« back to all changes in this revision

Viewing changes to hooks/horizon_utils.py

  • Committer: David Ames
  • Date: 2016-02-19 17:02:30 UTC
  • mfrom: (105.1.5 openstack-dashboard)
  • Revision ID: david.ames@canonical.com-20160219170230-29vukj5huhclr2m1
[jamespage, r=thedac] Fixup for newer haproxy, actually use timeouts from configuration

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/horizon_utils.py
141
141
        'services': ['apache2'],
142
142
    }),
143
143
    (HAPROXY_CONF, {
144
 
        'hook_contexts': [horizon_contexts.HorizonHAProxyContext()],
 
144
        'hook_contexts': [
 
145
            horizon_contexts.HorizonHAProxyContext(),
 
146
            context.HAProxyContext(singlenode_mode=True),
 
147
        ],
145
148
        'services': ['haproxy'],
146
149
    }),
147
150
    (ROUTER_SETTING, {