diff --git a/contrib/vagrant/README.md b/contrib/vagrant/README.md index f3864e609..cc1da5a70 100644 --- a/contrib/vagrant/README.md +++ b/contrib/vagrant/README.md @@ -1,7 +1,7 @@ vagrant-devstack-zun ======================= -A Vagrant based devstack setup for zun. +A Vagrant-based devstack setup for zun. Steps to try vagrant image: 1. Install virtual-box and vagrant on your local machine. 2. Git clone zun repository. diff --git a/specs/cinder-integration.rst b/specs/cinder-integration.rst index c6aa7c7ce..b489752ef 100644 --- a/specs/cinder-integration.rst +++ b/specs/cinder-integration.rst @@ -82,7 +82,7 @@ vol-name, vol-size fields. default attributes like storage engine Cinder, Cinder endpoint etc. * We also need to configure Cinder endpoint in Fuxi conf file. * We can use same implementation for Flocker also as it supports Cinder. -* I think if we can create seperate CinderDriver which calls from Volume +* I think if we can create separate CinderDriver which calls from Volume volume driver. This approach enables way to implement multiple storages supports in the future and we can plug-in multiple storage implementation. diff --git a/zun/compute/manager.py b/zun/compute/manager.py index ce0abff5f..f436c2375 100644 --- a/zun/compute/manager.py +++ b/zun/compute/manager.py @@ -338,7 +338,7 @@ class Manager(object): try: self.driver.update(container) except exception.DockerError as e: - LOG.error(_LE("Error occured while calling docker API: %s"), + LOG.error(_LE("Error occurred while calling docker API: %s"), six.text_type(e)) raise diff --git a/zun/image/driver.py b/zun/image/driver.py index 3f7ff2883..34336984f 100644 --- a/zun/image/driver.py +++ b/zun/image/driver.py @@ -87,7 +87,7 @@ def search_image(context, image_name, exact_match): exact_match=exact_match) images.extend(imgs) except Exception as e: - LOG.exception(_LE('Unknown exception occured while searching ' + LOG.exception(_LE('Unknown exception occurred while searching ' 'for image: %s'), six.text_type(e)) raise exception.ZunException(six.text_type(e)) return images