Merge pull request #74 from mprince/issue72

Add guest_os_type options for puppet provisioner
mayn · Oct 17, 2017 · 9d6a51a · 9d6a51a
2 parents 43665de + ebba443
commit 9d6a51a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/packerlicious/provisioner.py b/src/packerlicious/provisioner.py
@@ -18,6 +18,9 @@
 
 from . import BasePackerObject, PackerProperty, EnvVar, TemplateVar, validator
 
+# guest_os_type options for Chef and Puppet
+UNIX = "unix"
+WINDOWS = "windows"
 
 class PackerProvisioner(BasePackerObject):
 
@@ -81,10 +84,6 @@ class ChefClient(PackerProvisioner):
     """
     resource_type = "chef-client"
 
-    # guest_os_type options
-    UNIX = "unix"
-    WINDOWS = "windows"
-
     props = {
         'chef_environment': (str, False),
         'config_template': (str, False),
@@ -115,10 +114,6 @@ class ChefSolo(PackerProvisioner):
     """
     resource_type = "chef-solo"
 
-    # guest_os_type options
-    UNIX = "unix"
-    WINDOWS = "windows"
-
     props = {
         'chef_environment': (str, False),
         'config_template': (str, False),
@@ -246,8 +241,9 @@ class PuppetMasterless(PackerProvisioner):
 
     props = {
         'manifest_file': (str, True),
-        'extra_arguments': ([str], False),
         'execute_command': (str, False),
+        'extra_arguments': ([str], False),
+        'guest_os_type': (validator.string_list_item([UNIX, WINDOWS]), False),
         'facter': (dict, False),
         'hiera_config_path': (str, False),
         'ignore_exit_codes': (validator.boolean, False),
@@ -272,9 +268,11 @@ class PuppetServer(PackerProvisioner):
         'client_private_key_path': (str, False),
         'execute_command': (str, False),
         'facter': (dict, False),
+        'guest_os_type': (validator.string_list_item([UNIX, WINDOWS]), False),
         'ignore_exit_codes': (validator.boolean, False),
         'options': (str, False),
         'prevent_sudo': (validator.boolean, False),
+        'puppet_bin_dir': (str, False),
         'puppet_node': (str, False),
         'puppet_server': (str, False),
         'staging_dir': (str, False),

diff --git a/tests/packerlicious/test_validator.py b/tests/packerlicious/test_validator.py
@@ -122,6 +122,9 @@ def test_iam_path(self):
         for s in ['/%s/' % ('a'*511), '/%s/' % ('a'*1025)]:
             with pytest.raises(ValueError):
                 iam_path(s)
+        for s in ['%s' % ('a'*5)]:
+            with pytest.raises(ValueError):
+                iam_path(s)
 
     def test_iam_role_name(self):
         for s in ['a'*30, 'a'*64]: