openstack/kolla-ansible
Code Issues Proposed changes

Remove the deprecated kolla-build section

Browse Source 
TrivialFix

Change-Id: I3ee10efc093ed394c3af483a229dcd9dc732ec9a
This commit is contained in:
Jeffrey Zhang 2016-06-06 11:37:45 +08:00
parent 0ac3719a17
commit 9585c1be9f
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kolla/cmd/build.py
View File

@ -233,7 +233,6 @@ class BuildTask(task.Task):
self.image = image self.image = image
self.dc = docker_client() self.dc = docker_client()
self.push_queue = push_queue self.push_queue = push_queue
self.nocache = not conf.cache or conf.no_cache
self.forcerm = not conf.keep self.forcerm = not conf.keep
@property @property
@ -399,7 +398,7 @@ class BuildTask(task.Task):
buildargs = self.update_buildargs() buildargs = self.update_buildargs()
for response in self.dc.build(path=image.path, for response in self.dc.build(path=image.path,
tag=image.canonical_name, tag=image.canonical_name,
nocache=self.nocache, nocache=not self.conf.cache,
rm=True, rm=True,
pull=pull, pull=pull,
forcerm=self.forcerm, forcerm=self.forcerm,

2
kolla/common/config.py
View File

@ -127,7 +127,7 @@ _CLI_OPTS = [
' dependency in Graphviz dot format')), ' dependency in Graphviz dot format')),
cfg.StrOpt('type', short='t', default='binary', cfg.StrOpt('type', short='t', default='binary',
choices=INSTALL_TYPE_CHOICES, choices=INSTALL_TYPE_CHOICES,
dest='install_type', deprecated_group='kolla-build', dest='install_type',
help=('The method of the OpenStack install')), help=('The method of the OpenStack install')),
cfg.IntOpt('threads', short='T', default=8, min=1, cfg.IntOpt('threads', short='T', default=8, min=1,
deprecated_group='kolla-build', deprecated_group='kolla-build',