Update templates to v2016.11.1 salt release

CHANGELOG.md

@@ -7,6 +7,8 @@ This file is used to list changes made in each version of the Salt Cookbook
 - **[PR #29](https://github.com/shortdudey123/chef-salt/pull/29)** - split package repository setup to its own recipe
 - **[PR #30](https://github.com/shortdudey123/chef-salt/pull/30)** - Set default chefspec platform and version
 - **[PR #35](https://github.com/shortdudey123/chef-salt/pull/35)** - Switch to using ChefDK
+- **[PR #36](https://github.com/shortdudey123/chef-salt/pull/36)** - Add kitchen CI testing
+- **[PR #37](https://github.com/shortdudey123/chef-salt/pull/37)** - Update templates to v2016.11.1 salt release
 
 ## 2.0.0 (2016-09-13)
 - Remove CircleCI since TravisCI is already here

recipes/master.rb

@@ -20,15 +20,17 @@
   action :enable
 end
 
+master_config = node['salt']['master']['config'].to_h
+master_config['rest_cherrypy'] = node['salt']['master']['api']['config'].to_h if node['salt']['master']['api']['enable']
+
 template '/etc/salt/master' do
   source node['salt']['master']['config_template'] || 'master.erb'
   cookbook node['salt']['master']['config_cookbook'] || 'salt'
   owner 'root'
   group 'root'
   mode '0644'
   variables(
-    api: node['salt']['master']['api'],
-    config: node['salt']['master']['config']
+    config: master_config
   )
   notifies :restart, 'service[salt-master]', :delayed
   notifies :restart, 'service[salt-api]', :delayed if node['salt']['master']['api']['enable']

spec/recipes/master_spec.rb

@@ -32,26 +32,6 @@
         group: 'root',
         mode: '0644',
         variables: {
-          api: {
-            'enable' => false,
-            'install_opts' => nil,
-            'package' => 'salt-api',
-            'config' => {
-              'collect_stats' => false,
-              'debug' => false,
-              'disable_ssl' => true,
-              'expire_responses' => true,
-              'host' => '0.0.0.0',
-              'max_request_body_size' => 1048576,
-              'port' => 8000,
-              'socket_queue_size' => 30,
-              'ssl_crt' => nil,
-              'ssl_key' => nil,
-              'thread_pool' => 100,
-              'webhook_disable_auth' => false,
-              'webhook_url' => '/hook',
-            },
-          },
           config: {
             'interface' => '0.0.0.0',
             'ipv6' => false,
@@ -143,6 +123,96 @@
       end.converge(described_recipe)
     end
 
+    it 'create /etc/salt/master template' do
+      expect(chef_run).to create_template('/etc/salt/master').with(
+        source: 'master.erb',
+        cookbook: 'salt',
+        owner: 'root',
+        group: 'root',
+        mode: '0644',
+        variables: {
+          config: {
+            'interface' => '0.0.0.0',
+            'ipv6' => false,
+            'publish_port' => '4505',
+            'user' => 'root',
+            'max_open_files' => 100000,
+            'worker_threads' => 5,
+            'ret_port' => 4506,
+            'pidfile' => '/var/run/salt-master.pid',
+            'root_dir' => '/',
+            'pki_dir' => '/etc/salt/pki/master',
+            'cachedir' => '/var/cache/salt/master',
+            'verify_env' => true,
+            'keep_jobs' => 24,
+            'timeout' => 5,
+            'loop_interval' => 60,
+            'output' => 'nested',
+            'show_timeout' => true,
+            'color' => true,
+            'strip_colors' => false,
+            'sock_dir' => '/var/run/salt/master',
+            'enable_gpu_grains' => false,
+            'job_cache' => true,
+            'minion_data_cache' => true,
+            'event_return' => nil,
+            'event_return_queue' => 0,
+            'max_event_size' => 1048576,
+            'ping_on_rotate' => false,
+            'preserve_minion_cache' => false,
+            'con_cache' => false,
+            'open_mode' => false,
+            'auto_accept' => false,
+            'autosign_timeout' => 120,
+            'autosign_file' => '/etc/salt/autosign.conf',
+            'autoreject_file' => '/etc/salt/autoreject.conf',
+            'permissive_pki_access' => false,
+            'sudo_acl' => false,
+            'token_expire' => 43200,
+            'file_recv' => false,
+            'file_recv_max_size' => 100,
+            'sign_pub_messages' => false,
+            'cython_enable' => false,
+            'state_top' => 'top.sls',
+            'renderer' => 'yaml_jinja',
+            'jinja_lstrip_blocks' => false,
+            'failhard' => false,
+            'state_verbose' => true,
+            'state_output' => 'full',
+            'state_aggregate' => false,
+            'state_events' => false,
+            'hash_type' => 'md5',
+            'file_buffer_size' => '1048576',
+            'fileserver_events' => false,
+            'log_file' => '/var/log/salt/master',
+            'key_logfile' => '/var/log/salt/key',
+            'log_level' => 'warning',
+            'log_level_logfile' => 'warning',
+            'log_datefmt' => "'%H:%M:%S'",
+            'log_datefmt_logfile' => "'%Y-%m-%d %H:%M:%S'",
+            'log_fmt_console' => "'[%(levelname)-8s] %(message)s'",
+            'log_fmt_logfile' => "'%(asctime)s,%(msecs)03.0f [%(name)-17s][%(levelname)-8s] %(message)s'",
+            'return' => 'mysql',
+            'rest_cherrypy' => {
+              'collect_stats' => false,
+              'debug' => false,
+              'disable_ssl' => true,
+              'expire_responses' => true,
+              'host' => '0.0.0.0',
+              'max_request_body_size' => 1048576,
+              'port' => 8000,
+              'socket_queue_size' => 30,
+              'ssl_crt' => nil,
+              'ssl_key' => nil,
+              'thread_pool' => 100,
+              'webhook_disable_auth' => false,
+              'webhook_url' => '/hook',
+            },
+          },
+        }
+      )
+    end
+
     it 'install salt-api' do
       expect(chef_run).to install_package('salt-api').with(
         version: nil,