← Back to branch summary

~hopem/charms/trusty/cinder/ensure-apache-restart

« back to all changes in this revision

Viewing changes to hooks/cinder_contexts.py

  • Committer: Liam Young
  • Date: 2015-01-09 16:02:39 UTC
  • mfrom: (65 cinder.next)
  • mto: This revision was merged to the branch mainline in revision 67.
  • Revision ID: liam.young@canonical.com-20150109160239-qldk423wxfno2ao3
Merged next in and resolved conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/cinder_contexts.py
64
64
        Also used to extend cinder.conf context with correct api_listening_port
65
65
        '''
66
66
        haproxy_port = config('api-listening-port')
67
 
        api_port = determine_api_port(config('api-listening-port'))
68
 
        apache_port = determine_apache_port(config('api-listening-port'))
 
67
        api_port = determine_api_port(config('api-listening-port'),
 
68
                                      singlenode_mode=True)
 
69
        apache_port = determine_apache_port(config('api-listening-port'),
 
70
                                            singlenode_mode=True)
69
71
 
70
72
        ctxt = {
71
73
            'service_ports': {'cinder_api': [haproxy_port, apache_port]},