aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/base/neutron/plugins
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-12-22 20:49:28 +0000
committerGerrit Code Review <review@openstack.org>2016-12-22 20:49:28 +0000
commit3b74e6c05586cc3ad43bcc6a08f15637e55a3566 (patch)
tree7c260dc142065905692af6f76613c5fdf8e024d6 /manifests/profile/base/neutron/plugins
parent918bed5db00df194a317dc61f94c521340dab010 (diff)
parent4458ce0d9af2bb0a96506b7403ff60d4898b20cc (diff)
Merge "Split ovn plugin and northd configuration"
Diffstat (limited to 'manifests/profile/base/neutron/plugins')
-rw-r--r--manifests/profile/base/neutron/plugins/ml2/ovn.pp25
1 files changed, 14 insertions, 11 deletions
diff --git a/manifests/profile/base/neutron/plugins/ml2/ovn.pp b/manifests/profile/base/neutron/plugins/ml2/ovn.pp
index 46477a7..b5b7a0a 100644
--- a/manifests/profile/base/neutron/plugins/ml2/ovn.pp
+++ b/manifests/profile/base/neutron/plugins/ml2/ovn.pp
@@ -17,7 +17,16 @@
# OVN Neutron ML2 profile for tripleo
#
# [*ovn_db_host*]
-# The IP-Address/Hostname where OVN DBs are deployed
+# The IP-Address where OVN DBs are listening.
+# Defaults to hiera('ovn_dbs_vip')
+#
+# [*ovn_nb_port*]
+# (Optional) Port number on which northbound database is listening
+# Defaults to hiera('ovn::northbound::port')
+#
+# [*ovn_sb_port*]
+# (Optional) Port number on which southbound database is listening
+# Defaults to hiera('ovn::southbound::port')
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
@@ -25,18 +34,12 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::neutron::plugins::ml2::ovn (
- $ovn_db_host,
- $step = hiera('step')
+ $ovn_db_host = hiera('ovn_dbs_vip'),
+ $ovn_nb_port = hiera('ovn::northbound::port'),
+ $ovn_sb_port = hiera('ovn::southbound::port'),
+ $step = hiera('step')
) {
if $step >= 4 {
- if $::hostname == $ovn_db_host {
- # NOTE: we might split northd from plugin later, in the case of
- # micro-services, where neutron-server & northd are not in the same
- # containers
- include ::ovn::northd
- }
- $ovn_nb_port = hiera('ovn::northbound::port')
- $ovn_sb_port = hiera('ovn::southbound::port')
class { '::neutron::plugins::ml2::ovn':
ovn_nb_connection => "tcp:${ovn_db_host}:${ovn_nb_port}",
ovn_sb_connection => "tcp:${ovn_db_host}:${ovn_sb_port}",