summaryrefslogtreecommitdiffstats
path: root/manifests/profile
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-25 22:58:01 +0000
committerGerrit Code Review <review@openstack.org>2017-01-25 22:58:01 +0000
commitb7cde684f20881c480681abaec18503502824b80 (patch)
treee31e8ed71430e9d6b65f020fa4c93fad00256102 /manifests/profile
parent3849c6a6d3ab6df2bd1bcac006219a7fb1192f2f (diff)
parent13fb869de757b3904fe0309d9bf9a2420e79e451 (diff)
Merge "Remove double include of neutron::server class"
Diffstat (limited to 'manifests/profile')
-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,
- }
- }
}