Merge lp:~ralsina/tanuki-agent/separate-provkit into lp:tanuki-agent

[Roberto Alsina]

Support having the prov kit commands in a separate [provkit] section.

Support having the prov kit commands in a separate [provkit] section.

This is backwards compatible, prints a warning to suggest you update your config file.

[Bret Barker (noise)]

LGTM

review: Approve

=== modified file 'README.rst'
--- README.rst	2015-10-15 18:22:41 +0000
+++ README.rst	2015-10-27 17:16:29 +0000
@@ -52,6 +52,14 @@
 Release Notes
 =============
 
+October 27 2015
+---------------
+
+* The provisioning kit commands in the configuration file should be moved into
+  a separate [provkit] section. Currently the agent will warn if they are still
+  in the [config] section. For backwards compatibility, the old usage is still
+  supported.
+
 October 15 2015
 ---------------
 

=== modified file 'agent.py'
--- agent.py	2015-10-21 13:02:11 +0000
+++ agent.py	2015-10-27 17:16:29 +0000
@@ -54,9 +54,6 @@
     'id': 'agent-queue',
     'group': 'default',
     'interval': 10,
-    'provcommand': "/bin/echo provisioning now",
-    'setupcommand': "/bin/echo setting up now",
-    'testcommand': "/bin/echo -e '{\"foo\": \"bar\"}' > spi_test_result.json \\\c",
     'logging_basedir': os.path.join(os.path.dirname(__file__), 'logs'),
     'execution_basedir': os.path.join(os.path.dirname(__file__), 'run'),
     'organization_id': '',
@@ -64,6 +61,11 @@
     'network_timeout': 10,
 }
 
+DEFAULT_COMMANDS = {
+    'provcommand': "/bin/echo provisioning now",
+    'setupcommand': "/bin/echo setting up now",
+    'testcommand': "/bin/echo -e '{\"foo\": \"bar\"}' > spi_test_result.json \\\c",
+}
 
 if 'BuiltinImporter' in str(__loader__):
     nuitka = True
@@ -126,12 +128,19 @@
             'config', 'network_timeout', fallback=DEFAULT_CONFIG['network_timeout'])
         self.server = self.config.get('config', 'server', fallback=DEFAULT_CONFIG['server'])
 
+        if not self.config.has_section('provkit'):
+            self.log.warning('Deprecation: The provisioning kit commands '
+                             'should be moved to the [provkit] section.')
+
         self.testcommand = self.config.get(
-            'config', 'testcommand', fallback=DEFAULT_CONFIG['testcommand'])
+            'provkit', 'testcommand', fallback=self.config.get(
+                'config', 'testcommand', fallback=DEFAULT_COMMANDS['testcommand']))
         self.setupcommand = self.config.get(
-            'config', 'setupcommand', fallback=DEFAULT_CONFIG['setupcommand'])
+            'provkit', 'setupcommand', fallback=self.config.get(
+                'config', 'setupcommand', fallback=DEFAULT_COMMANDS['setupcommand']))
         self.provcommand = self.config.get(
-            'config', 'provcommand', fallback=DEFAULT_CONFIG['provcommand'])
+            'provkit', 'provcommand', fallback=self.config.get(
+                'config', 'provcommand', fallback=DEFAULT_COMMANDS['provcommand']))
 
         if 'auth' in self.config:  # Has authentication configured
             self.auth_data = {
@@ -177,6 +186,7 @@
         self.config = ConfigParser()
         self.config['config'] = DEFAULT_CONFIG
         self.config['environment'] = {}
+        self.config['provkit'] = DEFAULT_COMMANDS
         if self.confpath is None:
             self.config.write(sys.stdout)
         else:

=== modified file 'test_agent.py'
--- test_agent.py	2015-10-15 18:22:41 +0000
+++ test_agent.py	2015-10-27 17:16:29 +0000
@@ -452,7 +452,10 @@
     """Test that it prints default config."""
     agent.confpath = None
     agent.do_default_config()
-    assert '[config]' in capsys.readouterr()[0]
+    data = capsys.readouterr()[0]
+    assert '[config]' in data
+    assert '[provkit]' in data
+    assert '[environment]' in data
 
 
 def test_verbose(agent):