diff --git a/opencontrail/database.sls b/opencontrail/database.sls
index 520b425..6b482aa 100644
--- a/opencontrail/database.sls
+++ b/opencontrail/database.sls
@@ -4,24 +4,18 @@
 include:
 - opencontrail.common
 
-opencontrail_database_packages:
-  pkg.installed:
-  - names: {{ database.pkgs }}
-
 {% if database.cassandra.version == 1 %}
 
 /etc/cassandra/cassandra.yaml:
   file.managed:
   - source: salt://opencontrail/files/cassandra.yaml.1
   - template: jinja
-  - require:
-    - pkg: opencontrail_database_packages
+  - makedirs: True
 
 /etc/cassandra/cassandra-env.sh:
   file.managed:
   - source: salt://opencontrail/files/cassandra-env.sh.1
-  - require:
-    - pkg: opencontrail_database_packages
+  - makedirs: True
 
 {% else %}
 
@@ -29,18 +23,23 @@
   file.managed:
   - source: salt://opencontrail/files/{{ database.version }}/cassandra.yaml
   - template: jinja
-  - require:
-    - pkg: opencontrail_database_packages
+  - makedirs: True
 
 /etc/cassandra/cassandra-env.sh:
   file.managed:
   - source: salt://opencontrail/files/{{ database.version }}/database/cassandra-env.sh
   - template: jinja
-  - require:
-    - pkg: opencontrail_database_packages
+  - makedirs: True
 
 {% endif %}
 
+opencontrail_database_packages:
+  pkg.installed:
+  - names: {{ database.pkgs }}
+  - require:
+    - file: /etc/cassandra/cassandra.yaml
+    - file: /etc/cassandra/cassandra-env.sh
+
 /etc/zookeeper/conf/log4j.properties:
   file.managed:
   - source: salt://opencontrail/files/{{ database.version }}/database/log4j.properties
@@ -76,28 +75,6 @@
   file.managed:
   - contents: '{{ database.id }}'
 
-{% if database.cassandra.version != 1 %}
-
-{%- if salt['cmd.run']('test -e /var/lib/cassandra/.cassandra_bootstrap; echo $?') != '0'  %}
-
-cleanup_directory_before_first_run:
-  cmd.run:
-  - name: 'rm -rf /var/lib/cassandra/*'
-  - require_in:
-    - service: opencontrail_database_services
-
-cassandra_bootstrap_finish_flag:
-  file.touch:
-  - name: /var/lib/cassandra/.cassandra_bootstrap
-  - require:
-    - cmd: cleanup_directory_before_first_run
-  - require_in:
-    - service: opencontrail_database_services
-
-{%- endif %}
-
-{% endif %}
-
 opencontrail_database_services:
   service.running:
   - enable: true