Merge "trivialfix"

etc/openstack_deploy/env.d/extra_container.yml.example

@@ -1,17 +1,17 @@
 ---
 # Copyright 2014, Rackspace US, Inc.
-# #
-# # Licensed under the Apache License, Version 2.0 (the "License");
-# # you may not use this file except in compliance with the License.
-# # You may obtain a copy of the License at
-# #
-# #     http://www.apache.org/licenses/LICENSE-2.0
-# #
-# # Unless required by applicable law or agreed to in writing, software
-# # distributed under the License is distributed on an "AS IS" BASIS,
-# # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# # See the License for the specific language governing permissions and
-# # limitations under the License.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 component_skel:
   example_api:

scripts/gen-config.py

@@ -19,7 +19,7 @@ import argparse
 import os
 import sys
 
-from osa_toolki import tools
+from osa_toolkit import tools
 
 
 def args(arg_list):

tests/test_manage.py

@@ -93,7 +93,7 @@ class TestRemoveIpfunction(unittest.TestCase):
         mi.remove_inventory_item("log_hosts", inventory)
         mi.remove_inventory_item("log_hosts", inventory, TARGET_DIR)
 
-        # No make sure it's gone
+        # Now make sure it's gone
         self.assertIn('log_hosts', inventory)
 
     def test_metal_ips_kept(self):