summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuan Antonio Osorio Robles <jaosorior@redhat.com>2017-01-25 17:57:45 +0200
committerJuan Antonio Osorio Robles <jaosorior@redhat.com>2017-01-25 17:57:45 +0200
commit13fb869de757b3904fe0309d9bf9a2420e79e451 (patch)
tree04c056f0e1f7d70f7e8dfd199bc7ce69de80ddcb
parent4a77eb9e987c924ed4e31719f4c27340c71ad41a (diff)
Remove double include of neutron::server class
This class was being included in the same way in two different branches of the code which could be joined in the initial branch (or if statement). Change-Id: Iee3c1663a2fe929b21a9c089d89b721600af66bd
-rw-r--r--manifests/profile/base/neutron/server.pp9
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,
- }
- }
}