Merge pull request #15 from salt-formulas/pr/fix/database_juniper

Fix cassandra service (Juniper pkg's)
salt-formulas · May 4, 2017 · 53c019e · 53c019e
2 parents a3314b2 + c604edf
commit 53c019e
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/opencontrail/database.sls b/opencontrail/database.sls
@@ -1,4 +1,4 @@
-{%- from "opencontrail/map.jinja" import database with context %}
+{%- from "opencontrail/map.jinja" import database,common with context %}
 {%- if database.enabled %}
 
 include:
@@ -158,7 +158,12 @@ zookeeper_service:
 opencontrail_database_services:
   service.running:
   - enable: true
+{%- if common.vendor == "juniper" %}
+  - name: contrail-database
+{%- else %}
   - name: supervisor-database
+{%- endif %}
+  - init_delay: 5
   - watch:
     - file: {{ database.cassandra_config }}cassandra.yaml
     - file: {{ database.cassandra_config }}cassandra-env.sh