From f92371bfdd47e908da8b8ace4a9141e1a5daeb37 Mon Sep 17 00:00:00 2001
From: Paula Madalina Crismaru <pcrismaru@cloudbasesolutions.com>
Date: Fri, 30 Jun 2017 14:24:29 +0300
Subject: [PATCH] Fix the cloud-config keys that are processed by
 cloudbase-init

Some of the keys of the currently supported cloud-config plugins are not
the same as the ones used by cloud-init. This patch adds the correct keys
for the cloud-config plugins.

Change-Id: I901acb330f934b6144ff69f4f65d6053dfb8fe1b
---
 .../common/userdataplugins/cloudconfigplugins/factory.py    | 4 ++++
 .../userdataplugins/cloudconfigplugins/set_hostname.py      | 6 +++++-
 .../userdataplugins/cloudconfigplugins/set_timezone.py      | 4 ++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/cloudbaseinit/plugins/common/userdataplugins/cloudconfigplugins/factory.py b/cloudbaseinit/plugins/common/userdataplugins/cloudconfigplugins/factory.py
index 8bbab399..1ed26757 100644
--- a/cloudbaseinit/plugins/common/userdataplugins/cloudconfigplugins/factory.py
+++ b/cloudbaseinit/plugins/common/userdataplugins/cloudconfigplugins/factory.py
@@ -22,8 +22,12 @@ PLUGINS = {
                    'cloudconfigplugins.write_files.WriteFilesPlugin',
     'set_timezone': 'cloudbaseinit.plugins.common.userdataplugins.'
                     'cloudconfigplugins.set_timezone.SetTimezonePlugin',
+    'timezone': 'cloudbaseinit.plugins.common.userdataplugins.'
+                'cloudconfigplugins.set_timezone.SetTimezonePlugin',
     'set_hostname': 'cloudbaseinit.plugins.common.userdataplugins.'
                     'cloudconfigplugins.set_hostname.SetHostnamePlugin',
+    'hostname': 'cloudbaseinit.plugins.common.userdataplugins.'
+                'cloudconfigplugins.set_hostname.SetHostnamePlugin',
 }
 
 
diff --git a/cloudbaseinit/plugins/common/userdataplugins/cloudconfigplugins/set_hostname.py b/cloudbaseinit/plugins/common/userdataplugins/cloudconfigplugins/set_hostname.py
index 6b28361e..2b6bfe7d 100644
--- a/cloudbaseinit/plugins/common/userdataplugins/cloudconfigplugins/set_hostname.py
+++ b/cloudbaseinit/plugins/common/userdataplugins/cloudconfigplugins/set_hostname.py
@@ -27,7 +27,11 @@ LOG = oslo_logging.getLogger(__name__)
 class SetHostnamePlugin(base.BaseCloudConfigPlugin):
     """Change the hostname for the underlying platform.
 
-    If the timezone is changed a restart will be required.
+    If the hostname is changed a restart will be required.
+
+    To change the hostname to 'myhostname', use this syntax:
+
+        hostname: myhostname
 
     """
 
diff --git a/cloudbaseinit/plugins/common/userdataplugins/cloudconfigplugins/set_timezone.py b/cloudbaseinit/plugins/common/userdataplugins/cloudconfigplugins/set_timezone.py
index fc9b8b02..2b81cdcd 100644
--- a/cloudbaseinit/plugins/common/userdataplugins/cloudconfigplugins/set_timezone.py
+++ b/cloudbaseinit/plugins/common/userdataplugins/cloudconfigplugins/set_timezone.py
@@ -31,9 +31,9 @@ class SetTimezonePlugin(base.BaseCloudConfigPlugin):
     https://technet.microsoft.com/en-us/library/cc749073%28v=ws.10%29.aspx).
 
     For instance, to change the timezone to 'America/Montevideo', use
-    this syntax::
+    this syntax:
 
-        set_timezone: America/Montevideo
+        timezone: America/Montevideo
 
     """