4 files changed, 18 insertions, 14 deletions
diff --git a/manifests/profile/base/neutron.pp b/manifests/profile/base/neutron.pp
index 2958170..d5efa81 100644
--- a/manifests/profile/base/neutron.pp
+++ b/manifests/profile/base/neutron.pp
@@ -18,14 +18,19 @@
 #
 # === Parameters
 #
+# [*sync_db*]
+#   (Optional) Whether to run db sync
+#   Defaults to true
+#
 # [*step*]
 #   (Optional) The current step of the deployment
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::neutron (
-  $step = hiera('step'),
+  $sync_db = true,
+  $step    = hiera('step'),
 ) {
-  if $step >= 4 {
+  if hiera('step') >= 4 or ( hiera('step') >= 3 and $sync_db ) {
     include ::neutron
     include ::neutron::config
   }
diff --git a/manifests/profile/base/neutron/ml2.pp b/manifests/profile/base/neutron/ml2.pp
index 47b1b3c..d18638e 100644
--- a/manifests/profile/base/neutron/ml2.pp
+++ b/manifests/profile/base/neutron/ml2.pp
@@ -22,6 +22,10 @@
 #   (Optional) The mechanism drivers to use with the Ml2 plugin
 #   Defaults to hiera('neutron::plugins::ml2::mechanism_drivers')
 #
+# [*sync_db*]
+# (Optional) Whether to run Neutron DB sync operations
+# Defaults to undef
+#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
@@ -29,10 +33,11 @@
 #
 class tripleo::profile::base::neutron::ml2 (
   $mechanism_drivers  = hiera('neutron::plugins::ml2::mechanism_drivers'),
+  $sync_db            = true,
   $step               = hiera('step'),
 ) {
 
-  if $step >= 4 {
+  if $step >= 4 or ( $step >= 3 and $sync_db ) {
     include ::neutron::plugins::ml2
     include ::tripleo::profile::base::neutron
 
diff --git a/manifests/profile/base/neutron/server.pp b/manifests/profile/base/neutron/server.pp
index 14af56e..320f83c 100644
--- a/manifests/profile/base/neutron/server.pp
+++ b/manifests/profile/base/neutron/server.pp
@@ -18,31 +18,24 @@
 #
 # === Parameters
 #
-# [*sync_db*]
-#   (Optional) Whether to run Neutron DB sync operations
-#   Defaults to undef
-#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::neutron::server (
-  $sync_db          = true,
   $step             = hiera('step'),
 ) {
 
   include ::tripleo::profile::base::neutron
 
-  if $step >= 3 and $sync_db {
+  if $step >= 2 {
     include ::neutron::db::mysql
   }
 
-  if $step >= 4 or ($step >=3 and $sync_db) {
+  if $step >= 4 {
     include ::neutron::server::notifications
-
-    class { '::neutron::server':
-      sync_db        => $sync_db,
-    }
+    include ::neutron::server
   }
+
 }
diff --git a/manifests/profile/base/swift/proxy.pp b/manifests/profile/base/swift/proxy.pp
index 58e2b6f..40e61ae 100644
--- a/manifests/profile/base/swift/proxy.pp
+++ b/manifests/profile/base/swift/proxy.pp
@@ -40,5 +40,6 @@ class tripleo::profile::base::swift::proxy (
     include ::swift::proxy::catch_errors
     include ::swift::proxy::tempurl
     include ::swift::proxy::formpost
+    include ::swift::proxy::bulk
   }
 }