diff --git a/deployment_scripts/puppet/modules/contrail/manifests/database.pp b/deployment_scripts/puppet/modules/contrail/manifests/database.pp
index ebeca84db..e342781db 100644
--- a/deployment_scripts/puppet/modules/contrail/manifests/database.pp
+++ b/deployment_scripts/puppet/modules/contrail/manifests/database.pp
@@ -34,6 +34,7 @@ class contrail::database {
     value => '10'
   }
   if roles_include($contrail::contrail_db_roles) {
+    $cassandra_ips   = $::contrail::contrail_db_ips
     $cassandra_seeds = $contrail::primary_contrail_db_ip
     $cluster_name    = 'Contrail'
 
@@ -58,6 +59,7 @@ class contrail::database {
                     ],
     }
   } elsif roles_include($contrail::analytics_db_roles) {
+    $cassandra_ips   = $::contrail::analytics_db_ips
     $cassandra_seeds = $contrail::primary_analytics_db_ip
     $cluster_name    = 'Analytics'
   }
diff --git a/deployment_scripts/puppet/modules/contrail/templates/cassandra.yaml.erb b/deployment_scripts/puppet/modules/contrail/templates/cassandra.yaml.erb
index 1153d7f96..0c147d742 100644
--- a/deployment_scripts/puppet/modules/contrail/templates/cassandra.yaml.erb
+++ b/deployment_scripts/puppet/modules/contrail/templates/cassandra.yaml.erb
@@ -270,7 +270,7 @@ seed_provider:
       parameters:
           # seeds is actually a comma-delimited list of addresses.
           # Ex: "<ip1>,<ip2>,<ip3>"
-          - seeds: "<%= @cassandra_seeds.join(',') %>"
+          - seeds: "<%= @cassandra_ips.join(',') %>"
 
 # For workloads with more data than can fit in memory, Cassandra's
 # bottleneck will be reads that need to fetch data from
diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
index 655ee8385..96820a3aa 100644
--- a/deployment_tasks.yaml
+++ b/deployment_tasks.yaml
@@ -198,6 +198,7 @@
   type: puppet
   version: 2.0.0
   groups: [primary-contrail-db, primary-contrail-analytics-db]
+  reexecute_on: [deploy_changes]
   required_for: [deploy_end]
   requires: [contrail-utils]
   parameters:
@@ -223,6 +224,7 @@
   type: puppet
   version: 2.0.0
   groups: [contrail-db, contrail-analytics-db]
+  reexecute_on: [deploy_changes]
   required_for: [deploy_end]
   requires: [contrail-utils]
   cross-depends: