Merge "Remove double include of neutron::server class"

1 files changed, 1 insertions, 8 deletions

diff --git a/manifests/profile/base/neutron/server.pp b/manifests/profile/base/neutron/server.pp
index 4667ae2..fcd804d 100644
--- a/manifests/profile/base/neutron/server.pp
+++ b/manifests/profile/base/neutron/server.pp
@@ -73,7 +73,7 @@ class tripleo::profile::base::neutron::server (
   # We start neutron-server on the bootstrap node first, because
   # it will try to populate tables and we need to make sure this happens
   # before it starts on other nodes
-  if $step >= 4 and $sync_db {
+  if $step >= 4 and $sync_db or $step >= 5 and !$sync_db {
     include ::neutron::server::notifications
     # We need to override the hiera value neutron::server::sync_db which is set
     # to true
@@ -82,11 +82,4 @@ class tripleo::profile::base::neutron::server (
       l3_ha   => $l3_ha,
     }
   }
-  if $step >= 5 and !$sync_db {
-    include ::neutron::server::notifications
-    class { '::neutron::server':
-      sync_db => $sync_db,
-      l3_ha   => $l3_ha,
-    }
-  }
 }