Use include for base neutron profile

Simplify the base neutron profile so that we always include
the neutron and neutron::config classes at step 3. In doing so
we can now simplify the pacemaker version to use a simple include
which will avoid duplicate class errors.

Change-Id: I95b9188607ab6c599ad4cde6faa1deb081618f3e

1 files changed, 1 insertions, 6 deletions

diff --git a/manifests/profile/base/neutron.pp b/manifests/profile/base/neutron.pp
index d5efa81..1ee2d90 100644
--- a/manifests/profile/base/neutron.pp
+++ b/manifests/profile/base/neutron.pp
@@ -18,19 +18,14 @@
 #
 # === 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 (
-  $sync_db = true,
   $step    = hiera('step'),
 ) {
-  if hiera('step') >= 4 or ( hiera('step') >= 3 and $sync_db ) {
+  if hiera('step') >= 3 {
     include ::neutron
     include ::neutron::config
   }