← Back to branch summary

~openstack-charmers-archive/charms/trusty/nova-cloud-controller/old-stable

« back to all changes in this revision

Viewing changes to hooks/nova_cc_utils.py

  • Committer: james.page at ubuntu
  • Date: 2014-05-21 10:03:01 UTC
  • mfrom: (75.1.1 nova-cloud-controller)
  • Revision ID: james.page@ubuntu.com-20140521100301-wmm536lpzw9ouam7
[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/nova_cc_utils.py
102
102
                     context.SubordinateConfigContext(
103
103
                         interface='nova-vmware',
104
104
                         service='nova',
105
 
                         config_file=NOVA_CONF,
106
 
                     ),
 
105
                         config_file=NOVA_CONF),
107
106
                     context.SyslogContext(),
108
107
                     nova_cc_context.HAProxyContext(),
109
108
                     nova_cc_context.IdentityServiceContext(),