|
 |
a64660 |
From c9f938b9d07211aa4bc259e94450a55f1ba83694 Mon Sep 17 00:00:00 2001
|
|
|
a64660 |
From: =?UTF-8?q?Pablo=20Iranzo=20G=C3=B3mez?= <Pablo.Iranzo@gmail.com>
|
|
|
a64660 |
Date: Wed, 29 Jun 2016 17:41:57 +0200
|
|
|
a64660 |
Subject: [PATCH 03/21] Fix typo
|
|
|
a64660 |
|
|
|
a64660 |
Change-Id: I15deb824a85aa561c2f2e7f4ea6b4b1ce96367f9
|
|
|
a64660 |
---
|
|
|
a64660 |
heat_cfntools/cfntools/cfn_helper.py | 24 ++++++++++++------------
|
|
|
a64660 |
1 file changed, 12 insertions(+), 12 deletions(-)
|
|
|
a64660 |
|
|
|
a64660 |
diff --git a/heat_cfntools/cfntools/cfn_helper.py b/heat_cfntools/cfntools/cfn_helper.py
|
|
|
a64660 |
index 19424b0..f2b9f90 100644
|
|
|
a64660 |
--- a/heat_cfntools/cfntools/cfn_helper.py
|
|
|
a64660 |
+++ b/heat_cfntools/cfntools/cfn_helper.py
|
|
|
a64660 |
@@ -1154,19 +1154,19 @@ class GroupsHandler(object):
|
|
|
a64660 |
if command_status == 0:
|
|
|
a64660 |
LOG.info("%s has been successfully created" % group)
|
|
|
a64660 |
elif command_status == 9:
|
|
|
a64660 |
- LOG.error("An error occured creating %s group : " %
|
|
|
a64660 |
+ LOG.error("An error occurred creating %s group : " %
|
|
|
a64660 |
group + "group name not unique")
|
|
|
a64660 |
elif command_status == 4:
|
|
|
a64660 |
- LOG.error("An error occured creating %s group : " %
|
|
|
a64660 |
+ LOG.error("An error occurred creating %s group : " %
|
|
|
a64660 |
group + "GID not unique")
|
|
|
a64660 |
elif command_status == 3:
|
|
|
a64660 |
- LOG.error("An error occured creating %s group : " %
|
|
|
a64660 |
+ LOG.error("An error occurred creating %s group : " %
|
|
|
a64660 |
group + "GID not valid")
|
|
|
a64660 |
elif command_status == 2:
|
|
|
a64660 |
- LOG.error("An error occured creating %s group : " %
|
|
|
a64660 |
+ LOG.error("An error occurred creating %s group : " %
|
|
|
a64660 |
group + "Invalid syntax")
|
|
|
a64660 |
else:
|
|
|
a64660 |
- LOG.error("An error occured creating %s group" % group)
|
|
|
a64660 |
+ LOG.error("An error occurred creating %s group" % group)
|
|
|
a64660 |
|
|
|
a64660 |
|
|
|
a64660 |
class UsersHandler(object):
|
|
|
a64660 |
@@ -1209,22 +1209,22 @@ class UsersHandler(object):
|
|
|
a64660 |
if command_status == 0:
|
|
|
a64660 |
LOG.info("%s has been successfully created" % user)
|
|
|
a64660 |
elif command_status == 9:
|
|
|
a64660 |
- LOG.error("An error occured creating %s user : " %
|
|
|
a64660 |
+ LOG.error("An error occurred creating %s user : " %
|
|
|
a64660 |
user + "user name not unique")
|
|
|
a64660 |
elif command_status == 6:
|
|
|
a64660 |
- LOG.error("An error occured creating %s user : " %
|
|
|
a64660 |
+ LOG.error("An error occurred creating %s user : " %
|
|
|
a64660 |
user + "group does not exist")
|
|
|
a64660 |
elif command_status == 4:
|
|
|
a64660 |
- LOG.error("An error occured creating %s user : " %
|
|
|
a64660 |
+ LOG.error("An error occurred creating %s user : " %
|
|
|
a64660 |
user + "UID not unique")
|
|
|
a64660 |
elif command_status == 3:
|
|
|
a64660 |
- LOG.error("An error occured creating %s user : " %
|
|
|
a64660 |
+ LOG.error("An error occurred creating %s user : " %
|
|
|
a64660 |
user + "Invalid argument")
|
|
|
a64660 |
elif command_status == 2:
|
|
|
a64660 |
- LOG.error("An error occured creating %s user : " %
|
|
|
a64660 |
+ LOG.error("An error occurred creating %s user : " %
|
|
|
a64660 |
user + "Invalid syntax")
|
|
|
a64660 |
else:
|
|
|
a64660 |
- LOG.error("An error occured creating %s user" % user)
|
|
|
a64660 |
+ LOG.error("An error occurred creating %s user" % user)
|
|
|
a64660 |
|
|
|
a64660 |
|
|
|
a64660 |
class MetadataServerConnectionError(Exception):
|
|
|
a64660 |
@@ -1256,7 +1256,7 @@ class Metadata(object):
|
|
|
a64660 |
self._has_changed = False
|
|
|
a64660 |
|
|
|
a64660 |
def remote_metadata(self):
|
|
|
a64660 |
- """Connect to the metadata server and retreive the metadata."""
|
|
|
a64660 |
+ """Connect to the metadata server and retrieve the metadata."""
|
|
|
a64660 |
|
|
|
a64660 |
if self.credentials_file:
|
|
|
a64660 |
credentials = parse_creds_file(self.credentials_file)
|
|
|
a64660 |
--
|
|
|
a64660 |
2.20.1
|
|
|
a64660 |
|