Merge pull request #2 from robsweet/master

Adding --puppet-env-vars argument to be able to supply custom facts

Author: robsweet

README.md

@@ -32,13 +32,15 @@ Then you will need to make add an environment that uses the Puppet provisioner t
 ## Accepted arguments
 
 ```
---puppet_args - Extra arguments for Puppet.  Can be used to include a Puppet class with -e.
+--puppet-env-vars - Extra arguments for Puppet.  Can be used to include a Puppet class with -e.
 
---puppet_master - Hostname of Puppet Master
+--puppet-args - Extra arguments for Puppet.  Can be used to include a Puppet class with -e.
 
---puppet_certs_dir - Used when generating/copying certs for use with Puppet Master
+--puppet-master - Hostname of Puppet Master
 
---puppet_private_keys_dir - Used when generating/copying certs for use with Puppet Master
+--puppet-certs-dir - Used when generating/copying certs for use with Puppet Master
+
+--puppet-private-keys-dir - Used when generating/copying certs for use with Puppet Master
 ```
 
 ## Usage with a Master
@@ -55,7 +57,7 @@ Puppet will use the default hostname 'puppet' to try to talk to the Puppet Maste
 ### Master specified
 
 ```
-sudo aminate -B ami-35792c5c --puppet_master=puppet-master.domain.com some-host.domain.com
+sudo aminate -B ami-35792c5c --puppet-master=puppet-master.domain.com some-host.domain.com
 ```
 
 Puppet will use the specified hostname to try to talk to the Puppet Master server and generate certs with the name in the last argument.
@@ -82,6 +84,15 @@ sudo aminate -B ami-35792c5c /full/path/to/my_manifest_tarball.tgz
 Aminator will untar the manifests to /etc/puppet/modules (or /etc/puppet if the tarball contains a modules directory) and run Puppet apply.
 
 
+### Masterless passing custom facts
+
+```
+sudo aminate -B ami-35792c5c --puppet-env-vars="FACTER_my_fact=some_value; FACTER_fact2=value2" /full/path/to/my_manifest_tarball.tgz
+```
+
+Aminator will add the specified variables to the environment for Puppet runs.  The most obvious use for this is to pass custom facts to Puppet that are used in the Puppet manifests.  Pairs are delimited by semi-colon.
+
+
 ### Masterless with modules and arguments for the apply
 
 ```

aminatorplugins/provisioner/puppet.py

@@ -23,6 +23,7 @@
 ================================
 """
 import os
+import re
 import glob
 import shutil
 import time
@@ -61,6 +62,10 @@ def add_plugin_args(self):
                                     action=conf_action(self._config.plugins[self.full_name]),
                                     help='Extra arguments for Puppet.  Can be used to include a Puppet class with -e.')
 
+        puppet_config.add_argument('--puppet-env-vars', dest='puppet_env_vars',
+                                    action=conf_action(self._config.plugins[self.full_name]),
+                                    help='Environment arguments for Puppet, delimited by a semi-colon.  Can be used to do things like pass custom Facter facts.')
+
         puppet_config.add_argument('--puppet-master', dest='puppet_master',
                                     action=conf_action(self._config.plugins[self.full_name]),
                                     help='Hostname of Puppet Master')
@@ -100,12 +105,22 @@ def provision(self):
         self._decide_puppet_run_mode()
         self._pre_chroot_block()
 
+        if re.compile('\S=\S').search(self._get_config_value('puppet_env_vars')):
+            parsed_env_vars = dict([x.split('=') for x in re.compile("\s?;\s?").split(self._get_config_value('puppet_env_vars'))])
+            log.info("\tAdding to Puppet apply environment:")
+            for key, value in parsed_env_vars.iteritems():
+                log.info("\t{0}={1}".format(key,value))
+            log.info('=========================================================================================================')
+            os.environ.update( parsed_env_vars )
+
         log.debug('Entering chroot at {0}'.format(self._distro._mountpoint))
         with Chroot(self._distro._mountpoint):
 
             self._install_puppet()
 
-            escaped_args = self._escaped_puppet_args()
+            escaped_args = self._escaped('puppet_args')
+
+
 
             if self._puppet_run_mode is 'master':
                 log.info('Running puppet agent')
@@ -206,9 +221,9 @@ def _list_files(self, startpath):
                 log.debug((len(path) - start_len + 1) * '---' + '{0}'.format(file))
         log.debug("********************************************************")
 
-    def _escaped_puppet_args(self):
+    def _escaped(self, config_name):
         import re
-        return re.sub('\s','\ ', self._get_config_value('puppet_args', '' ))
+        return re.sub('\s','\ ', self._get_config_value(config_name, '' ))
 
     def _decide_puppet_run_mode(self):
         if os.access( self._config.context.package.arg, os.F_OK ):