diff options
| author | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-06-06 11:37:45 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-06-07 09:04:57 +0800 |
| commit | 9585c1be9f5bddb000b1aa6be68264df9f2aa445 (patch) | |
| tree | 12163397a41b45a86b6bbb1e58b6b6426c6b087d | |
| parent | 0ac3719a1709ae50d68b5b8a6722a4b734036d7a (diff) | |
| download | kolla-9585c1be9f5bddb000b1aa6be68264df9f2aa445.tar.gz kolla-9585c1be9f5bddb000b1aa6be68264df9f2aa445.zip | |
Remove the deprecated kolla-build section
TrivialFix
Change-Id: I3ee10efc093ed394c3af483a229dcd9dc732ec9a
| -rwxr-xr-x | kolla/cmd/build.py | 3 | ||||
| -rw-r--r-- | kolla/common/config.py | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/kolla/cmd/build.py b/kolla/cmd/build.py index 30c9dbd51..a84a49f6b 100755 --- a/kolla/cmd/build.py +++ b/kolla/cmd/build.py @@ -233,7 +233,6 @@ class BuildTask(task.Task): self.image = image self.dc = docker_client() self.push_queue = push_queue - self.nocache = not conf.cache or conf.no_cache self.forcerm = not conf.keep @property @@ -399,7 +398,7 @@ class BuildTask(task.Task): buildargs = self.update_buildargs() for response in self.dc.build(path=image.path, tag=image.canonical_name, - nocache=self.nocache, + nocache=not self.conf.cache, rm=True, pull=pull, forcerm=self.forcerm, diff --git a/kolla/common/config.py b/kolla/common/config.py index ccc9587d9..903fd693d 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -127,7 +127,7 @@ _CLI_OPTS = [ ' dependency in Graphviz dot format')), cfg.StrOpt('type', short='t', default='binary', choices=INSTALL_TYPE_CHOICES, - dest='install_type', deprecated_group='kolla-build', + dest='install_type', help=('The method of the OpenStack install')), cfg.IntOpt('threads', short='T', default=8, min=1, deprecated_group='kolla-build', |