Merge pull request #57 from daks/source-files

Option to specify an absolute salt:// path for config_files

kitchen.yml

@@ -182,13 +182,18 @@ suites:
         base:
           '*':
             - rabbitmq
+            - rabbitmq.config_files
       pillars:
         top.sls:
           base:
             '*':
               - rabbitmq
       pillars_from_files:
         rabbitmq.sls: pillar.example
+      dependencies:
+        - name: files
+          path: ./test/salt
+
     verifier:
       inspec_tests:
         - path: test/integration/default
@@ -198,13 +203,17 @@ suites:
         base:
           '*':
             - rabbitmq.latest
+            - rabbitmq.config_files
       pillars:
         top.sls:
           base:
             '*':
               - rabbitmq
       pillars_from_files:
         rabbitmq.sls: pillar.example
+      dependencies:
+        - name: files
+          path: ./test/salt
     verifier:
       inspec_tests:
         - path: test/integration/default

pillar.example

@@ -39,12 +39,14 @@ rabbitmq:
   config_files:
     # config_files, if you need some stuffs set directly in configuration
     # files, rather than via the light modules available.
-    rabbitmq.config:
-      # Need to add some template in rabbitmq/templates/rabbitmq.config
-      # templates not provided, as is probably too specific...
-      source: templates/relay-rabbitmq.config
+    rabbitmq.conf:
+      # source is relative to `rabbitmq` formula
+      # source: templates/rabbitmq.conf
+      # or absolute in salt fileserver
+      source: salt://files/rabbitmq/rabbitmq.conf
+      # an optional map can be passed to the jinja template
       context:
         src_broker_uri: "amqp://user:[email protected]"
-    rabbitmqcfg.json:
-      source: templates/relay-rabbitmqcfg.config
-      # context: is optional map passed to the jinja template...
+#    rabbitmqcfg.json:
+#      source: templates/relay-rabbitmqcfg.config
+#      # context: is optional map passed to the jinja template...

rabbitmq/config_files.sls

@@ -2,10 +2,15 @@
 include:
   - .install
 
-{% for filename, info in salt["pillar.get"]("rabbitmq:config_files", {}).items() %}
+{%- for filename, info in salt["pillar.get"]("rabbitmq:config_files", {}).items() %}
+  {%- set source = info['source'] %}
 /etc/rabbitmq/{{ filename }}:
   file.managed:
-    - source: salt://{{ slspath }}/{{ info['source'] }}
+    {%- if source.startswith('salt://') %}
+    - source: {{ source }}
+    {%- else %}
+    - source: salt://{{ slspath }}/{{ source }}
+    {% endif %}
     - template: jinja
     - context: {{ info.get('context', {})|json }}
     - watch_in:

test/integration/default/controls/config.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+control 'rabbitmq configuration' do
+  title 'should match desired lines'
+
+  describe file('/etc/rabbitmq/rabbitmq.conf') do
+    it { should exist }
+    it { should be_file }
+    its('content') { should include '# Config file for rabbitmq' }
+  end
+end

test/salt/files/rabbitmq/rabbitmq.conf

@@ -0,0 +1 @@
+# Config file for rabbitmq