← Back to branch summary

~ubuntu-branches/ubuntu/raring/cinder/raring-updates

« back to all changes in this revision

Viewing changes to cinder/service.py

Tags: upstream-2013.1~g2
Import upstream version 2013.1~g2

Show diffs side-by-side

added added

removed removed

Lines of Context:
cinder/service.py
59
59
               help='IP address for OpenStack Volume API to listen'),
60
60
    cfg.IntOpt('osapi_volume_listen_port',
61
61
               default=8776,
62
 
               help='port for os volume api to listen'),
63
 
    ]
 
62
               help='port for os volume api to listen'), ]
64
63
 
65
64
FLAGS = flags.FLAGS
66
65
FLAGS.register_opts(service_opts)
305
304
                state_catalog['availability_zone'] = zone
306
305
 
307
306
            db.service_update(ctxt,
308
 
                             self.service_id, state_catalog)
 
307
                              self.service_id, state_catalog)
309
308
 
310
309
            # TODO(termie): make this pattern be more elegant.
311
310
            if getattr(self, 'model_disconnected', False):