Merge pull request #33 from olhado/fix_service

Fix an issue where if the formula was not configuring the agent, it wo…

Author: olhado

.kitchen.yml

@@ -69,7 +69,6 @@ platforms:
         - yum install -y audit initscripts
         - sed -i 's/local_events = yes/local_events = no/g' /etc/audit/auditd.conf
         - systemctl enable auditd.service
-    image: centos:7
   - name: centos-7
     image: centos:7
     driver_config:

threatstack/init.sls

@@ -139,11 +139,19 @@ tsagent-config:
 # NOTE: We do not signal the cloudsight service to restart via the package
 # resource because the workflow differs between fresh installation and
 # upgrades.  The package scripts will handle this.
+#
+# We only enable the service if `ts_configure_agent` is True, because if
+# the agent isn't configured, starting up the agent will fail
+{% if pillar['ts_configure_agent'] is not defined or pillar['ts_configure_agent'] == True %}
 threatstack:
   service.running:
     - enable: True
     - restart: True
-{% if pillar['ts_agent_config_args'] is defined %}
+  {% if pillar['ts_agent_config_args'] is defined %}
     - watch:
       - cmd: tsagent-config
+  {% endif %}
+{% else %}
+threatstack:
+  service.enabled
 {% endif %}