Merge "Define sheepdog_port as an integer value"
This commit is contained in:
commit
ceeb44f9d7
|
@ -34,7 +34,7 @@ import glance.store.location
|
||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
|
|
||||||
DEFAULT_ADDR = 'localhost'
|
DEFAULT_ADDR = 'localhost'
|
||||||
DEFAULT_PORT = '7000'
|
DEFAULT_PORT = 7000
|
||||||
DEFAULT_CHUNKSIZE = 64 # in MiB
|
DEFAULT_CHUNKSIZE = 64 # in MiB
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
|
@ -44,7 +44,7 @@ sheepdog_opts = [
|
||||||
help=_('Images will be chunked into objects of this size '
|
help=_('Images will be chunked into objects of this size '
|
||||||
'(in megabytes). For best performance, this should be '
|
'(in megabytes). For best performance, this should be '
|
||||||
'a power of two.')),
|
'a power of two.')),
|
||||||
cfg.StrOpt('sheepdog_store_port', default=DEFAULT_PORT,
|
cfg.IntOpt('sheepdog_store_port', default=DEFAULT_PORT,
|
||||||
help=_('Port of sheep daemon.')),
|
help=_('Port of sheep daemon.')),
|
||||||
cfg.StrOpt('sheepdog_store_address', default=DEFAULT_ADDR,
|
cfg.StrOpt('sheepdog_store_address', default=DEFAULT_ADDR,
|
||||||
help=_('IP address of sheep daemon.'))
|
help=_('IP address of sheep daemon.'))
|
||||||
|
@ -64,7 +64,7 @@ class SheepdogImage:
|
||||||
self.chunk_size = chunk_size
|
self.chunk_size = chunk_size
|
||||||
|
|
||||||
def _run_command(self, command, data, *params):
|
def _run_command(self, command, data, *params):
|
||||||
cmd = ("collie vdi %(command)s -a %(addr)s -p %(port)s %(name)s "
|
cmd = ("collie vdi %(command)s -a %(addr)s -p %(port)d %(name)s "
|
||||||
"%(params)s" %
|
"%(params)s" %
|
||||||
{"command": command,
|
{"command": command,
|
||||||
"addr": self.addr,
|
"addr": self.addr,
|
||||||
|
|
Loading…
Reference in New Issue