aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/base/neutron.pp
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/profile/base/neutron.pp')
-rw-r--r--manifests/profile/base/neutron.pp108
1 files changed, 98 insertions, 10 deletions
diff --git a/manifests/profile/base/neutron.pp b/manifests/profile/base/neutron.pp
index e6a32db..2f01b75 100644
--- a/manifests/profile/base/neutron.pp
+++ b/manifests/profile/base/neutron.pp
@@ -22,23 +22,111 @@
# (Optional) The current step of the deployment
# Defaults to hiera('step')
#
-# [*rabbit_hosts*]
-# list of the rabbbit host fqdns
+# [*oslomsg_rpc_proto*]
+# Protocol driver for the oslo messaging rpc service
+# Defaults to hiera('messaging_rpc_service_name', rabbit)
+#
+# [*oslomsg_rpc_hosts*]
+# list of the oslo messaging rpc host fqdns
+# Defaults to hiera('rabbitmq_node_names')
+#
+# [*oslomsg_rpc_port*]
+# IP port for oslo messaging rpc service
+# Defaults to hiera('neutron::rabbit_port', 5672)
+#
+# [*oslomsg_rpc_username*]
+# Username for oslo messaging rpc service
+# Defaults to hiera('neutron::rabbit_userid', 'guest')
+#
+# [*oslomsg_rpc_password*]
+# Password for oslo messaging rpc service
+# Defaults to hiera('neutron::rabbit_password')
+#
+# [*oslomsg_notify_proto*]
+# Protocol driver for the oslo messaging notify service
+# Defaults to hiera('messaging_notify_service_name', rabbit)
+#
+# [*oslomsg_notify_hosts*]
+# list of the oslo messaging notify host fqdns
# Defaults to hiera('rabbitmq_node_names')
#
-# [*rabbit_port*]
-# IP port for rabbitmq service
-# Defaults to hiera('neutron::rabbit_port', 5672
+# [*oslomsg_notify_port*]
+# IP port for oslo messaging notify service
+# Defaults to hiera('neutron::rabbit_port', 5672)
+#
+# [*oslomsg_notify_username*]
+# Username for oslo messaging notify service
+# Defaults to hiera('neutron::rabbit_userid', 'guest')
+#
+# [*oslomsg_notify_password*]
+# Password for oslo messaging notify service
+# Defaults to hiera('neutron::rabbit_password')
+#
+# [*oslomsg_use_ssl*]
+# Enable ssl oslo messaging services
+# Defaults to hiera('neutron::rabbit_use_ssl', '0')
+#
+# [*dhcp_agents_per_network*]
+# (Optional) TripleO configured number of DHCP agents
+# to use per network. If left to the default value, neutron will be
+# configured with the number of DHCP agents being deployed.
+# Defaults to undef
+#
+# [*dhcp_nodes*]
+# (Optional) List of nodes running the DHCP agent. Used to
+# set neutron's dhcp_agents_per_network value to the number
+# of available agents.
+# Defaults to hiera('neutron_dhcp_short_node_names') or []
+#
class tripleo::profile::base::neutron (
- $step = hiera('step'),
- $rabbit_hosts = hiera('rabbitmq_node_names', undef),
- $rabbit_port = hiera('neutron::rabbit_port', 5672),
+ $step = hiera('step'),
+ $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
+ $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),
+ $oslomsg_rpc_password = hiera('neutron::rabbit_password'),
+ $oslomsg_rpc_port = hiera('neutron::rabbit_port', '5672'),
+ $oslomsg_rpc_username = hiera('neutron::rabbit_userid', 'guest'),
+ $oslomsg_notify_proto = hiera('messaging_notify_service_name', 'rabbit'),
+ $oslomsg_notify_hosts = any2array(hiera('rabbitmq_node_names', undef)),
+ $oslomsg_notify_password = hiera('neutron::rabbit_password'),
+ $oslomsg_notify_port = hiera('neutron::rabbit_port', '5672'),
+ $oslomsg_notify_username = hiera('neutron::rabbit_userid', 'guest'),
+ $oslomsg_use_ssl = hiera('neutron::rabbit_use_ssl', '0'),
+ $dhcp_agents_per_network = undef,
+ $dhcp_nodes = hiera('neutron_dhcp_short_node_names', []),
) {
if $step >= 3 {
- $rabbit_endpoints = suffix(any2array($rabbit_hosts), ":${rabbit_port}")
+ $oslomsg_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_use_ssl)))
+
+ $dhcp_agent_count = size($dhcp_nodes)
+ if $dhcp_agents_per_network {
+ $dhcp_agents_per_net = $dhcp_agents_per_network
+ if ($dhcp_agents_per_net > $dhcp_agent_count) {
+ warning("dhcp_agents_per_network (${dhcp_agents_per_net}) is greater\
+ than the number of deployed dhcp agents (${dhcp_agent_count})")
+ }
+ }
+ elsif $dhcp_agent_count > 0 {
+ $dhcp_agents_per_net = $dhcp_agent_count
+ }
class { '::neutron' :
- rabbit_hosts => $rabbit_endpoints,
+ default_transport_url => os_transport_url({
+ 'transport' => $oslomsg_rpc_proto,
+ 'hosts' => $oslomsg_rpc_hosts,
+ 'port' => $oslomsg_rpc_port,
+ 'username' => $oslomsg_rpc_username,
+ 'password' => $oslomsg_rpc_password,
+ 'ssl' => $oslomsg_use_ssl_real,
+ }),
+ notification_transport_url => os_transport_url({
+ 'transport' => $oslomsg_notify_proto,
+ 'hosts' => $oslomsg_notify_hosts,
+ 'port' => $oslomsg_notify_port,
+ 'username' => $oslomsg_notify_username,
+ 'password' => $oslomsg_notify_password,
+ 'ssl' => $oslomsg_use_ssl_real,
+ }),
+ dhcp_agents_per_network => $dhcp_agents_per_net,
}
include ::neutron::config
}