summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-04 15:49:09 +0000
committerGerrit Code Review <review@openstack.org>2017-06-04 15:49:09 +0000
commite623d95f2d1de9d45350cc4394deeb7239abc69d (patch)
tree29707aec75aa6e79470dd5ee5c438dd56489b28b
parentac454d681fd6393c3d4b11aaadfad64e35c5e051 (diff)
parent521e536416774193fba2ab61efb0324310a922e6 (diff)
downloadkolla-e623d95f2d1de9d45350cc4394deeb7239abc69d.tar.gz
kolla-e623d95f2d1de9d45350cc4394deeb7239abc69d.zip
Merge "Add dots at first line in docstring"
-rw-r--r--kolla/exception.py2
-rwxr-xr-xkolla/image/build.py16
-rw-r--r--kolla/template/methods.py2
3 files changed, 10 insertions, 10 deletions
diff --git a/kolla/exception.py b/kolla/exception.py
index a495ba844..4b5677db1 100644
--- a/kolla/exception.py
+++ b/kolla/exception.py
@@ -10,7 +10,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-"""Kolla exception subclasses"""
+"""Kolla exception subclasses."""
class KollaDirNotFoundException(Exception):
diff --git a/kolla/image/build.py b/kolla/image/build.py
index 0d7e7ef82..2c727a25b 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -648,7 +648,7 @@ class KollaWorker(object):
)
def setup_working_dir(self):
- """Creates a working directory for use while building"""
+ """Creates a working directory for use while building."""
if self.conf.work_dir:
self.working_dir = os.path.join(self.conf.work_dir, 'docker')
else:
@@ -676,7 +676,7 @@ class KollaWorker(object):
return filters
def _get_methods(self):
- """Mapping of available Jinja methods
+ """Mapping of available Jinja methods.
return a dictionary that maps available function names and their
corresponding python methods to make them available in jinja templates
@@ -765,7 +765,7 @@ class KollaWorker(object):
return {tpl_name: tpl_content}
def find_dockerfiles(self):
- """Recursive search for Dockerfiles in the working directory"""
+ """Recursive search for Dockerfiles in the working directory."""
self.docker_build_paths = list()
path = self.working_dir
filename = 'Dockerfile.j2'
@@ -778,12 +778,12 @@ class KollaWorker(object):
LOG.debug('Found %d Dockerfiles', len(self.docker_build_paths))
def cleanup(self):
- """Remove temp files"""
+ """Remove temp files."""
if not self.conf.work_dir:
shutil.rmtree(self.temp_dir)
def filter_images(self):
- """Filter which images to build"""
+ """Filter which images to build."""
filter_ = list()
if self.regex:
@@ -823,7 +823,7 @@ class KollaWorker(object):
image.status = STATUS_MATCHED
def summary(self):
- """Walk the dictionary of images statuses and print results"""
+ """Walk the dictionary of images statuses and print results."""
# For debug we print the logs again if the image error'd. This is to
# help us debug and it will be extra helpful in the gate.
for image in self.images:
@@ -1032,7 +1032,7 @@ class KollaWorker(object):
pprint.pprint(ancestry)
def find_parents(self):
- """Associate all images with parents and children"""
+ """Associate all images with parents and children."""
sort_images = dict()
for image in self.images:
@@ -1045,7 +1045,7 @@ class KollaWorker(object):
image.parent = parent
def build_queue(self, push_queue):
- """Organizes Queue list
+ """Organizes Queue list.
Return a list of Queues that have been organized into a hierarchy
based on dependencies
diff --git a/kolla/template/methods.py b/kolla/template/methods.py
index 06a97afa8..4e90e75e6 100644
--- a/kolla/template/methods.py
+++ b/kolla/template/methods.py
@@ -14,7 +14,7 @@
def debian_package_install(packages):
- """Jinja utility method for building debian-based package install command
+ """Jinja utility method for building debian-based package install command.
apt-get is not capable of installing .deb files from a URL and the
template logic to construct a series of steps to install regular packages