openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Neutron: Replace hiera by lookup"

This commit is contained in:
Zuul 2022-09-03 21:49:08 +00:00 committed by Gerrit Code Review
parent 143a0c232c b52cf6a00f
commit ccfd7b2536
34 changed files with 204 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
manifests/profile/base/neutron.pp
View File

@ -20,55 +20,55 @@
#
# [*step*]
# (Optional) The current step of the deployment
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
# [*oslomsg_rpc_proto*]
# Protocol driver for the oslo messaging rpc service
# Defaults to hiera('oslo_messaging_rpc_scheme', rabbit)
# Defaults to lookup('oslo_messaging_rpc_scheme', undef, undef, 'rabbit')
#
# [*oslomsg_rpc_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('oslo_messaging_rpc_node_names')
# Defaults to any2array(lookup('oslo_messaging_rpc_node_names', undef, undef, undef))
#
# [*oslomsg_rpc_port*]
# IP port for oslo messaging rpc service
# Defaults to hiera('oslo_messaging_rpc_port', 5672)
# Defaults to lookup('oslo_messaging_rpc_port', undef, undef, '5672')
#
# [*oslomsg_rpc_username*]
# Username for oslo messaging rpc service
# Defaults to hiera('oslo_messaging_rpc_user_name', 'guest')
# Defaults to lookup('oslo_messaging_rpc_user_name', undef, undef, 'guest')
#
# [*oslomsg_rpc_password*]
# Password for oslo messaging rpc service
# Defaults to hiera('oslo_messaging_rpc_password')
# Defaults to lookup('oslo_messaging_rpc_password')
#
# [*oslomsg_rpc_use_ssl*]
# Enable ssl oslo messaging services
# Defaults to hiera('oslo_messaging_rpc_use_ssl', '0')
# Defaults to lookup('oslo_messaging_rpc_use_ssl', undef, undef, '0')
#
# [*oslomsg_notify_proto*]
# Protocol driver for the oslo messaging notify service
# Defaults to hiera('oslo_messaging_notify_scheme', rabbit)
# Defaults to lookup('oslo_messaging_notify_scheme', undef, undef, 'rabbit')
#
# [*oslomsg_notify_hosts*]
# list of the oslo messaging notify host fqdns
# Defaults to hiera('oslo_messaging_notify_node_names')
# Defaults to any2array(lookup('oslo_messaging_notify_node_names', undef, undef, undef))
#
# [*oslomsg_notify_port*]
# IP port for oslo messaging notify service
# Defaults to hiera('oslo_messaging_notify_port', 5672)
# Defaults to lookup('oslo_messaging_notify_port', undef, undef, '5672')
#
# [*oslomsg_notify_username*]
# Username for oslo messaging notify service
# Defaults to hiera('oslo_messaging_notify_user_name', 'guest')
# Defaults to lookup('oslo_messaging_notify_user_name', undef, undef, 'guest')
#
# [*oslomsg_notify_password*]
# Password for oslo messaging notify service
# Defaults to hiera('oslo_messaging_notify_password')
# Defaults to lookup('oslo_messaging_notify_password')
#
# [*oslomsg_notify_use_ssl*]
# Enable ssl oslo messaging services
# Defaults to hiera('oslo_messaging_notify_use_ssl', '0')
# Defaults to lookup('oslo_messaging_notify_use_ssl', undef, undef, '0')
#
# [*dhcp_agents_per_network*]
# (Optional) TripleO configured number of DHCP agents
@ -80,32 +80,31 @@
# (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 []
# Defaults to lookup('neutron_dhcp_short_node_names') or []
#
# [*container_cli*]
# (Optional) A container CLI to be used with the wrapper
# tooling to manage containers controled by Neutron/OVN
# l3/dhcp/metadata agents. Accepts only 'podman'
# Defaults to hiera('container_cli', 'podman').
# Defaults to lookup('container_cli', undef, undef, 'podman').
#
class tripleo::profile::base::neutron (
$step = Integer(hiera('step')),
$oslomsg_rpc_proto = hiera('oslo_messaging_rpc_scheme', 'rabbit'),
$oslomsg_rpc_hosts = any2array(hiera('oslo_messaging_rpc_node_names', undef)),
$oslomsg_rpc_password = hiera('oslo_messaging_rpc_password'),
$oslomsg_rpc_port = hiera('oslo_messaging_rpc_port', '5672'),
$oslomsg_rpc_username = hiera('oslo_messaging_rpc_user_name', 'guest'),
$oslomsg_rpc_use_ssl = hiera('oslo_messaging_rpc_use_ssl', '0'),
$oslomsg_notify_proto = hiera('oslo_messaging_notify_scheme', 'rabbit'),
$oslomsg_notify_hosts = any2array(hiera('oslo_messaging_notify_node_names', undef)),
$oslomsg_notify_password = hiera('oslo_messaging_notify_password'),
$oslomsg_notify_port = hiera('oslo_messaging_notify_port', '5672'),
$oslomsg_notify_username = hiera('oslo_messaging_notify_user_name', 'guest'),
$oslomsg_notify_use_ssl = hiera('oslo_messaging_notify_use_ssl', '0'),
$step = Integer(lookup('step')),
$oslomsg_rpc_proto = lookup('oslo_messaging_rpc_scheme', undef, undef, 'rabbit'),
$oslomsg_rpc_hosts = any2array(lookup('oslo_messaging_rpc_node_names', undef, undef, undef)),
$oslomsg_rpc_password = lookup('oslo_messaging_rpc_password'),
$oslomsg_rpc_port = lookup('oslo_messaging_rpc_port', undef, undef, '5672'),
$oslomsg_rpc_username = lookup('oslo_messaging_rpc_user_name', undef, undef, 'guest'),
$oslomsg_rpc_use_ssl = lookup('oslo_messaging_rpc_use_ssl', undef, undef, '0'),
$oslomsg_notify_proto = lookup('oslo_messaging_notify_scheme', undef, undef, 'rabbit'),
$oslomsg_notify_hosts = any2array(lookup('oslo_messaging_notify_node_names', undef, undef, undef)),
$oslomsg_notify_password = lookup('oslo_messaging_notify_password'),
$oslomsg_notify_port = lookup('oslo_messaging_notify_port', undef, undef, '5672'),
$oslomsg_notify_username = lookup('oslo_messaging_notify_user_name', undef, undef, 'guest'),
$oslomsg_notify_use_ssl = lookup('oslo_messaging_notify_use_ssl', undef, undef, '0'),
$dhcp_agents_per_network = undef,
$dhcp_nodes = hiera('neutron_dhcp_short_node_names', []),
$container_cli = hiera('container_cli', 'podman'),
$dhcp_nodes = lookup('neutron_dhcp_short_node_names', undef, undef, []),
$container_cli = lookup('container_cli', undef, undef, 'podman'),
) {
if $step >= 3 {
# NOTE(bogdando) validate_* is deprecated and we do not want to use it here
@ -125,8 +124,8 @@ class tripleo::profile::base::neutron (
elsif $dhcp_agent_count > 0 {
$dhcp_agents_per_net = $dhcp_agent_count
}
if hiera('nova_is_additional_cell', undef) {
$oslomsg_rpc_hosts_real = delete($oslomsg_rpc_hosts, any2array(hiera('oslo_messaging_rpc_cell_node_names', undef)))
if lookup('nova_is_additional_cell', undef, undef, undef) {
$oslomsg_rpc_hosts_real = delete($oslomsg_rpc_hosts, any2array(lookup('oslo_messaging_rpc_cell_node_names', undef, undef, undef)))
} else {
$oslomsg_rpc_hosts_real = $oslomsg_rpc_hosts
}

4
manifests/profile/base/neutron/agents/bagpipe.pp
View File

@ -24,10 +24,10 @@
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
class tripleo::profile::base::neutron::agents::bagpipe (
$step = Integer(hiera('step')),
$step = Integer(lookup('step')),
) {
include tripleo::profile::base::neutron

4
manifests/profile/base/neutron/agents/l2gw.pp
View File

@ -24,10 +24,10 @@
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
class tripleo::profile::base::neutron::agents::l2gw (
$step = Integer(hiera('step')),
$step = Integer(lookup('step')),
) {
if $step >= 4 {
include neutron::agents::l2gw

4
manifests/profile/base/neutron/agents/mlnx.pp
View File

@ -8,11 +8,11 @@
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
class tripleo::profile::base::neutron::agents::mlnx(
$step = Integer(hiera('step'))
$step = Integer(lookup('step'))
) {
file { '/etc/neutron/plugins/mlnx':

4
manifests/profile/base/neutron/agents/networking_baremetal.pp
View File

@ -21,11 +21,11 @@
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
class tripleo::profile::base::neutron::agents::networking_baremetal(
$step = Integer(hiera('step'))
$step = Integer(lookup('step'))
) {
include tripleo::profile::base::neutron

20
manifests/profile/base/neutron/agents/nuage.pp
View File

@ -20,19 +20,19 @@
#
# [*nova_auth_ip*]
# (Optional) Nova auth IP
# Defaults to hiera('keystone_public_api_virtual_ip')
# Defaults to lookup('keystone_public_api_virtual_ip')
#
# [*nova_metadata_ip*]
# (Optional) Nova metadata node IPs
# Defaults to hiera('nova_metadata_node_ips')
# Defaults to lookup('nova_metadata_node_ips')
#
# [*nova_os_password*]
# (Optional) Nova password
# Defaults to hiera('nova_password')
# Defaults to lookup('nova_password')
#
# [*nova_os_tenant_name*]
# (Optional) Nova tenant name
# Defaults to hiera('nova_os_tenant_name')
# Defaults to lookup('nova_os_tenant_name')
#
# [*enable_metadata_agent*]
# (Optional) Enable metadata agent
@ -40,15 +40,15 @@
#
# [*step*]
# (Optional) The current step of the deployment
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
class tripleo::profile::base::neutron::agents::nuage (
$nova_auth_ip = hiera('keystone_public_api_virtual_ip', ''),
$nova_metadata_ip = hiera('nova_metadata_node_ips', ''),
$nova_os_password = hiera('nova_password', ''),
$nova_os_tenant_name = hiera('nova::api::admin_tenant_name', ''),
$nova_auth_ip = lookup('keystone_public_api_virtual_ip', undef, undef, ''),
$nova_metadata_ip = lookup('nova_metadata_node_ips', undef, undef, ''),
$nova_os_password = lookup('nova_password', undef, undef, ''),
$nova_os_tenant_name = lookup('nova::api::admin_tenant_name', undef, undef, ''),
$enable_metadata_agent = true,
$step = Integer(hiera('step')),
$step = Integer(lookup('step')),
) {
if $step >= 4 {
include nuage::vrs

24
manifests/profile/base/neutron/agents/ovn.pp
View File

@ -18,20 +18,20 @@
#
# [*ovn_db_host*]
# (Optional) The IP-Address where OVN DBs are listening.
# Defaults to hiera('ovn_dbs_vip')
# Defaults to lookup('ovn_dbs_vip', undef, undef, undef)
#
# [*ovn_db_node_ips*]
# (Optional) The OVN DBs node ip addresses are listening.
# Defaults to hiera('ovn_dbs_node_ips')
# Defaults to lookup('ovn_dbs_node_ips', undef, undef, undef)
#
# [*ovn_db_clustered*]
# (Optional) Boolean indicating if we're running with ovn db clustering
# or pacemaker. Defaults to false for backwards compatibility
# Defaults to hiera('ovn_db_clustered', false)
# Defaults to lookup('ovn_db_clustered', undef, undef, false)
#
# [*ovn_sbdb_port*]
# (Optional) Port number on which southbound database is listening
# Defaults to hiera('ovn::southbound::port')
# Defaults to lookup('ovn::southbound::port')
#
# [*protocol*]
# (optional) Protocol use in communication with dbs
@ -40,7 +40,7 @@
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
# [*ovn_chassis_mac_map*]
# (optional) A list of key-value pairs that map a chassis specific mac to
@ -50,16 +50,16 @@
# These are the macs that ovn-controller will replace a router port
# mac with, if packet is going from a distributed router port on
# vlan type logical switch.
# Defaults to hiera('ovn_chassis_mac_map')
# Defaults to lookup('ovn_chassis_mac_map', undef, undef, undef)
#
class tripleo::profile::base::neutron::agents::ovn (
$ovn_db_host = hiera('ovn_dbs_vip', undef),
$ovn_db_node_ips = hiera('ovn_dbs_node_ips', undef),
$ovn_db_clustered = hiera('ovn_db_clustered', false),
$ovn_sbdb_port = hiera('ovn::southbound::port'),
$ovn_db_host = lookup('ovn_dbs_vip', undef, undef, undef),
$ovn_db_node_ips = lookup('ovn_dbs_node_ips', undef, undef, undef),
$ovn_db_clustered = lookup('ovn_db_clustered', undef, undef, false),
$ovn_sbdb_port = lookup('ovn::southbound::port'),
$protocol = 'tcp',
$step = Integer(hiera('step')),
$ovn_chassis_mac_map = hiera('ovn_chassis_mac_map', undef),
$step = Integer(lookup('step')),
$ovn_chassis_mac_map = lookup('ovn_chassis_mac_map', undef, undef, undef),
) {
if $step >= 4 {
if $ovn_db_clustered {

8
manifests/profile/base/neutron/agents/vpp.pp
View File

@ -21,19 +21,19 @@
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
# [*etcd_host*]
# (Optional) etcd server VIP.
# Defaults to hiera('etcd_vip')
# Defaults to lookup('etcd_vip')
#
# [*etcd_port*]
# (Optional) etcd server listening port.
# Defaults to 2379
#
class tripleo::profile::base::neutron::agents::vpp(
$step = Integer(hiera('step')),
$etcd_host = hiera('etcd_vip'),
$step = Integer(lookup('step')),
$etcd_host = lookup('etcd_vip'),
$etcd_port = 2379,
) {
if empty($etcd_host) {

24
manifests/profile/base/neutron/authtoken.pp
View File

@ -21,28 +21,28 @@
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
# [*memcached_hosts*]
# (Optional) Array of hostnames, ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_names', [])
# Defaults to lookup('memcached_node_names', undef, undef, [])
#
# [*memcached_port*]
# (Optional) Memcached port to use.
# Defaults to hiera('memcached_authtoken_port', 11211)
# Defaults to lookup('memcached_authtoken_port', undef, undef, 11211)
#
# [*memcached_ipv6*]
# (Optional) Whether Memcached uses IPv6 network instead of IPv4 network.
# Defauls to hiera('memcached_ipv6', false)
# Defauls to lookup('memcached_ipv6', undef, undef, false)
#
# [*security_strategy*]
# (Optional) Memcached (authtoken) security strategy.
# Defaults to hiera('memcached_authtoken_security_strategy', undef)
# Defaults to lookup('memcached_authtoken_security_strategy', undef, undef, undef)
#
# [*secret_key*]
# (Optional) Memcached (authtoken) secret key, used with security_strategy.
# The key is hashed with a salt, to isolate services.
# Defaults to hiera('memcached_authtoken_secret_key', undef)
# Defaults to lookup('memcached_authtoken_secret_key', undef, undef, undef)
#
# DEPRECATED PARAMETERS
#
@ -51,12 +51,12 @@
# Defaults to undef
#
class tripleo::profile::base::neutron::authtoken (
$step = Integer(hiera('step')),
$memcached_hosts = hiera('memcached_node_names', []),
$memcached_port = hiera('memcached_authtoken_port', 11211),
$memcached_ipv6 = hiera('memcached_ipv6', false),
$security_strategy = hiera('memcached_authtoken_security_strategy', undef),
$secret_key = hiera('memcached_authtoken_secret_key', undef),
$step = Integer(lookup('step')),
$memcached_hosts = lookup('memcached_node_names', undef, undef, []),
$memcached_port = lookup('memcached_authtoken_port', undef, undef, 11211),
$memcached_ipv6 = lookup('memcached_ipv6', undef, undef, false),
$security_strategy = lookup('memcached_authtoken_security_strategy', undef, undef, undef),
$secret_key = lookup('memcached_authtoken_secret_key', undef, undef, undef),
# DEPRECATED PARAMETERS
$memcached_ips = undef
) {

4
manifests/profile/base/neutron/bgpvpn.pp
View File

@ -24,10 +24,10 @@
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
class tripleo::profile::base::neutron::bgpvpn (
$step = Integer(hiera('step')),
$step = Integer(lookup('step')),
) {
include tripleo::profile::base::neutron

8
manifests/profile/base/neutron/dhcp.pp
View File

@ -21,7 +21,7 @@
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
# [*neutron_dns_integration*]
# (Optional) Configure neutron to use the supplied unbound resolver nodes.
@ -29,12 +29,12 @@
#
# [*unbound_resolvers*]
# (Optional) Unbound resolvers if configured.
# Defaults to hiera('unbound_node_ips', undef)
# Defaults to lookup('unbound_node_ips', undef, undef, undef)
#
class tripleo::profile::base::neutron::dhcp (
$step = Integer(hiera('step')),
$step = Integer(lookup('step')),
$neutron_dns_integration = false,
$unbound_resolvers = hiera('unbound_node_ips', undef),
$unbound_resolvers = lookup('unbound_node_ips', undef, undef, undef),
) {
if $step >= 4 {
include tripleo::profile::base::neutron

2
manifests/profile/base/neutron/dhcp_agent_wrappers.pp
View File

@ -57,7 +57,7 @@ class tripleo::profile::base::neutron::dhcp_agent_wrappers (
$haproxy_image = undef,
Boolean $debug = false,
) {
$container_cli = hiera('tripleo::profile::base::neutron::container_cli', 'podman')
$container_cli = lookup('tripleo::profile::base::neutron::container_cli', undef, undef, 'podman')
if $enable_dnsmasq_wrapper {
unless $dnsmasq_image and $dnsmasq_process_wrapper{
fail('The container image for dnsmasq and wrapper filename must be provided when generating dnsmasq wrappers')

4
manifests/profile/base/neutron/l2gw.pp
View File

@ -24,10 +24,10 @@
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
class tripleo::profile::base::neutron::l2gw (
$step = Integer(hiera('step')),
$step = Integer(lookup('step')),
) {
include tripleo::profile::base::neutron

4
manifests/profile/base/neutron/l3.pp
View File

@ -21,10 +21,10 @@
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
class tripleo::profile::base::neutron::l3 (
$step = Integer(hiera('step')),
$step = Integer(lookup('step')),
) {
if $step >= 4 {
include tripleo::profile::base::neutron

2
manifests/profile/base/neutron/l3_agent_wrappers.pp
View File

@ -97,7 +97,7 @@ class tripleo::profile::base::neutron::l3_agent_wrappers (
$dibbler_image = undef,
Boolean $debug = false,
) {
$container_cli = hiera('tripleo::profile::base::neutron::container_cli', 'podman')
$container_cli = lookup('tripleo::profile::base::neutron::container_cli', undef, undef, 'podman')
if $enable_haproxy_wrapper {
unless $haproxy_image and $haproxy_process_wrapper{
fail('The container image for haproxy and wrapper filename must be provided when generating haproxy wrappers')

12
manifests/profile/base/neutron/linuxbridge.pp
View File

@ -7,14 +7,14 @@
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templatee
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
class tripleo::profile::base::neutron::linuxbridge(
$step = Integer(hiera('step')),
$step = Integer(lookup('step')),
) {
include tripleo::profile::base::neutron
include tripleo::profile::base::neutron
if $step >= 5 {
include neutron::agents::ml2::linuxbridge
}
if $step >= 5 {
include neutron::agents::ml2::linuxbridge
}
}

4
manifests/profile/base/neutron/metadata.pp
View File

@ -21,10 +21,10 @@
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
class tripleo::profile::base::neutron::metadata (
$step = Integer(hiera('step')),
$step = Integer(lookup('step')),
) {
if $step >= 4 {
include tripleo::profile::base::neutron

22
manifests/profile/base/neutron/ovn_metadata.pp
View File

@ -20,20 +20,20 @@
#
# [*ovn_db_host*]
# The IP-Address where OVN DBs are listening.
# Defaults to hiera('ovn_dbs_vip')
# Defaults to lookup('ovn_dbs_vip', undef, undef, undef)
#
# [*ovn_db_node_ips*]
# (Optional) The OVN DBs node ip addresses are listening.
# Defaults to hiera('ovn_dbs_node_ips')
# Defaults to lookup('ovn_dbs_node_ips', undef, undef, undef)
#
# [*ovn_db_clustered*]
# (Optional) Boolean indicating if we're running with ovn db clustering
# or pacemaker. Defaults to false for backwards compatibility
# Defaults to hiera('ovn_db_clustered', false)
# Defaults to lookup('ovn_db_clustered', undef, undef, false)
#
# [*ovn_sb_port*]
# (Optional) Port number on which southbound database is listening
# Defaults to hiera('ovn::southbound::port')
# Defaults to lookup('ovn::southbound::port')
#
# [*ovn_sb_private_key*]
# (optional) The PEM file with private key for SSL connection to OVN-SB-DB
@ -51,23 +51,23 @@
#
# [*protocol*]
# (optional) Protocol use in communication with dbs
# Defaults to tcp
# Defaults to 'tcp'
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
class tripleo::profile::base::neutron::ovn_metadata (
$ovn_db_host = hiera('ovn_dbs_vip', undef),
$ovn_db_node_ips = hiera('ovn_dbs_node_ips', undef),
$ovn_db_clustered = hiera('ovn_db_clustered', false),
$ovn_sb_port = hiera('ovn::southbound::port'),
$ovn_db_host = lookup('ovn_dbs_vip', undef, undef, undef),
$ovn_db_node_ips = lookup('ovn_dbs_node_ips', undef, undef, undef),
$ovn_db_clustered = lookup('ovn_db_clustered', undef, undef, false),
$ovn_sb_port = lookup('ovn::southbound::port'),
$ovn_sb_private_key = $::os_service_default,
$ovn_sb_certificate = $::os_service_default,
$ovn_sb_ca_cert = $::os_service_default,
$protocol = 'tcp',
$step = Integer(hiera('step')),
$step = Integer(lookup('step')),
) {
if $step >= 4 {
include tripleo::profile::base::neutron

2
manifests/profile/base/neutron/ovn_metadata_agent_wrappers.pp
View File

@ -41,7 +41,7 @@ class tripleo::profile::base::neutron::ovn_metadata_agent_wrappers (
$haproxy_image = undef,
Boolean $debug = false,
) {
$container_cli = hiera('tripleo::profile::base::neutron::container_cli', 'podman')
$container_cli = lookup('tripleo::profile::base::neutron::container_cli', undef, undef, 'podman')
if $enable_haproxy_wrapper {
unless $haproxy_image and $haproxy_process_wrapper{
fail('The container image for haproxy and wrapper filename must be provided when generating haproxy wrappers')

8
manifests/profile/base/neutron/ovn_northd.pp
View File

@ -18,16 +18,16 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('ovn_dbs_short_bootstrap_node_name')
# Defaults to lookup('ovn_dbs_short_bootstrap_node_name', undef, undef, undef)
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
class tripleo::profile::base::neutron::ovn_northd (
$bootstrap_node = hiera('ovn_dbs_short_bootstrap_node_name', undef),
$step = Integer(hiera('step')),
$bootstrap_node = lookup('ovn_dbs_short_bootstrap_node_name', undef, undef, undef),
$step = Integer(lookup('step')),
) {
if $step >= 4 {
# Note this only runs on the first node in the cluster when

17
manifests/profile/base/neutron/ovs.pp
View File

@ -21,26 +21,27 @@
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
# [*vhostuser_socket_dir*]
# (Optional) vhostuser socket dir, The directory where $vhostuser_socket_dir
# will be created with correct permissions, inorder to support vhostuser
# client mode.
# Defaults to lookup('neutron::agents::ml2::ovs::vhostuser_socket_dir', undef, undef, undef)
#
# [*vhostuser_socket_group*]
# (Optional) Group name for vhostuser socket dir.
# Defaults to qemu
# Defaults to lookup('vhostuser_socket_group', undef, undef, 'qemu')
#
# [*vhostuser_socket_user*]
# (Optional) User name for vhostuser socket dir.
# Defaults to qemu
# Defaults to lookup('vhostuser_socket_user', undef, undef, 'qemu')
#
class tripleo::profile::base::neutron::ovs(
$step = Integer(hiera('step')),
$vhostuser_socket_dir = hiera('neutron::agents::ml2::ovs::vhostuser_socket_dir', undef),
$vhostuser_socket_group = hiera('vhostuser_socket_group', 'qemu'),
$vhostuser_socket_user = hiera('vhostuser_socket_user', 'qemu'),
$step = Integer(lookup('step')),
$vhostuser_socket_dir = lookup('neutron::agents::ml2::ovs::vhostuser_socket_dir', undef, undef, undef),
$vhostuser_socket_group = lookup('vhostuser_socket_group', undef, undef, 'qemu'),
$vhostuser_socket_user = lookup('vhostuser_socket_user', undef, undef, 'qemu'),
) {
include tripleo::profile::base::neutron

16
manifests/profile/base/neutron/plugins/ml2.pp
View File

@ -20,29 +20,29 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('neutron_plugin_ml2_short_bootstrap_node_name')
# Defaults to lookup('neutron_plugin_ml2_short_bootstrap_node_name', undef, undef, undef)
#
# [*mechanism_drivers*]
# (Optional) The mechanism drivers to use with the Ml2 plugin
# Defaults to hiera('neutron::plugins::ml2::mechanism_drivers')
# Defaults to lookup('neutron::plugins::ml2::mechanism_drivers')
#
# [*service_names*]
# (Optional) List of services enabled on the current role.
# We may not want to configure a ml2 plugin for a role,
# in spite of the fact that it is in the drivers list.
# Check if the required service is enabled from the service list.
# Defaults to hiera('service_names')
# Defaults to lookup('service_names')
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
class tripleo::profile::base::neutron::plugins::ml2 (
$bootstrap_node = hiera('neutron_plugin_ml2_short_bootstrap_node_name', undef),
$mechanism_drivers = hiera('neutron::plugins::ml2::mechanism_drivers'),
$service_names = hiera('service_names'),
$step = Integer(hiera('step')),
$bootstrap_node = lookup('neutron_plugin_ml2_short_bootstrap_node_name', undef, undef, undef),
$mechanism_drivers = lookup('neutron::plugins::ml2::mechanism_drivers'),
$service_names = lookup('service_names'),
$step = Integer(lookup('step')),
) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true

4
manifests/profile/base/neutron/plugins/ml2/bagpipe.pp
View File

@ -24,10 +24,10 @@
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
class tripleo::profile::base::neutron::plugins::ml2::bagpipe (
$step = Integer(hiera('step')),
$step = Integer(lookup('step')),
) {
include tripleo::profile::base::neutron

16
manifests/profile/base/neutron/plugins/ml2/networking_ansible.pp
View File

@ -20,27 +20,27 @@
#
# [*neutron_redis_password*]
# (Required) Password for the neutron redis user for the coordination url
# Defaults to hiera('neutron_redis_password'),
# Defaults to lookup('neutron_redis_password'),
#
# [*redis_vip*]
# (Required) Redis ip address for the coordination url
# Defaults to hiera('redis_vip'),
# Defaults to lookup('redis_vip'),
#
# [*enable_internal_tls*]
# (Optional) Whether TLS in the internal network is enabled or not.
# Defaults to hiera('enable_internal_tls', false)
# Defaults to lookup('enable_internal_tls', undef, undef, false)
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
class tripleo::profile::base::neutron::plugins::ml2::networking_ansible(
$neutron_redis_password = hiera('neutron_redis_password'),
$redis_vip = hiera('redis_vip'),
$enable_internal_tls = hiera('enable_internal_tls', false),
$step = Integer(hiera('step'))
$neutron_redis_password = lookup('neutron_redis_password'),
$redis_vip = lookup('redis_vip'),
$enable_internal_tls = lookup('enable_internal_tls', undef, undef, false),
$step = Integer(lookup('step'))
) {
include tripleo::profile::base::neutron

4
manifests/profile/base/neutron/plugins/ml2/networking_baremetal.pp
View File

@ -21,11 +21,11 @@
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
class tripleo::profile::base::neutron::plugins::ml2::networking_baremetal(
$step = Integer(hiera('step'))
$step = Integer(lookup('step'))
) {
include tripleo::profile::base::neutron

6
manifests/profile/base/neutron/plugins/ml2/nuage.pp
View File

@ -19,15 +19,15 @@
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
# [*enable_vrs*]
# (Optional) Enable VRS or not
# Defaults to false
#
class tripleo::profile::base::neutron::plugins::ml2::nuage (
$step = hiera('step'),
$enable_vrs = false,
$step = Integer(lookup('step')),
$enable_vrs = false,
) {
if $step >= 4 {

32
manifests/profile/base/neutron/plugins/ml2/ovn.pp
View File

@ -18,24 +18,24 @@
#
# [*ovn_db_host*]
# The IP-Address where OVN DBs are listening.
# Defaults to hiera('ovn_dbs_vip')
# Defaults to lookup('ovn_dbs_vip', undef, undef, undef)
#
# [*ovn_db_node_ips*]
# (Optional) The OVN DBs node ip addresses are listening.
# Defaults to hiera('ovn_dbs_node_ips')
# Defaults to lookup('ovn_dbs_node_ips', undef, undef, undef)
#
# [*ovn_db_clustered*]
# (Optional) Boolean indicating if we're running with ovn db clustering
# or pacemaker. Defaults to false for backwards compatibility
# Defaults to hiera('ovn_db_clustered', false)
# Defaults to lookup('ovn_db_clustered', undef, undef, false)
#
# [*ovn_nb_port*]
# (Optional) Port number on which northbound database is listening
# Defaults to hiera('ovn::northbound::port')
# Defaults to lookup('ovn::northbound::port')
#
# [*ovn_sb_port*]
# (Optional) Port number on which southbound database is listening
# Defaults to hiera('ovn::southbound::port')
# Defaults to lookup('ovn::southbound::port')
#
# [*ovn_nb_private_key*]
# (optional) The PEM file with private key for SSL connection to OVN-NB-DB
@ -72,7 +72,7 @@
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
# [*neutron_dns_integration*]
# (Optional) Configure neutron to use the supplied unbound resolver nodes.
@ -80,18 +80,18 @@
#
# [*unbound_resolvers*]
# (Optional) Unbound resolvers if configured.
# Defaults to hiera('unbound_node_ips', undef)
# Defaults to lookup('unbound_node_ips', undef, undef, undef)
#
# [*dns_servers*]
# (Optional) Heat template defined dns servers if provided.
# Defaults to hiera('neutron::plugins::ml2::ovn', $::os_service_default)
# Defaults to lookup('neutron::plugins::ml2::ovn', undef, undef, $::os_service_default)
#
class tripleo::profile::base::neutron::plugins::ml2::ovn (
$ovn_db_host = hiera('ovn_dbs_vip', undef),
$ovn_db_node_ips = hiera('ovn_dbs_node_ips', undef),
$ovn_db_clustered = hiera('ovn_db_clustered', false),
$ovn_nb_port = hiera('ovn::northbound::port'),
$ovn_sb_port = hiera('ovn::southbound::port'),
$ovn_db_host = lookup('ovn_dbs_vip', undef, undef, undef),
$ovn_db_node_ips = lookup('ovn_dbs_node_ips', undef, undef, undef),
$ovn_db_clustered = lookup('ovn_db_clustered', undef, undef, false),
$ovn_nb_port = lookup('ovn::northbound::port'),
$ovn_sb_port = lookup('ovn::southbound::port'),
$ovn_nb_private_key = $::os_service_default,
$ovn_nb_certificate = $::os_service_default,
$ovn_nb_ca_cert = $::os_service_default,
@ -99,10 +99,10 @@ class tripleo::profile::base::neutron::plugins::ml2::ovn (
$ovn_sb_certificate = $::os_service_default,
$ovn_sb_ca_cert = $::os_service_default,
$protocol = 'tcp',
$step = Integer(hiera('step')),
$step = Integer(lookup('step')),
$neutron_dns_integration = false,
$unbound_resolvers = hiera('unbound_node_ips', undef),
$dns_servers = hiera('neutron::plugins::ml2::ovn::dns_servers', $::os_service_default),
$unbound_resolvers = lookup('unbound_node_ips', undef, undef, undef),
$dns_servers = lookup('neutron::plugins::ml2::ovn::dns_servers', undef, undef, $::os_service_default),
) {
if $step >= 4 {

8
manifests/profile/base/neutron/plugins/ml2/vpp.pp
View File

@ -21,19 +21,19 @@
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
# [*etcd_host*]
# (Optional) etcd server VIP.
# Defaults to hiera('etcd_vip')
# Defaults to lookup('etcd_vip')
#
# [*etcd_port*]
# (Optional) etcd server listening port.
# Defaults to 2379
#
class tripleo::profile::base::neutron::plugins::ml2::vpp (
$step = Integer(hiera('step')),
$etcd_host = hiera('etcd_vip'),
$step = Integer(lookup('step')),
$etcd_host = lookup('etcd_vip'),
$etcd_port = 2379,
) {
if empty($etcd_host) {

12
manifests/profile/base/neutron/plugins/ml2/vts.pp
View File

@ -21,21 +21,21 @@
#
# [*vts_url_ip*]
# (Optional) IP address of the VTS Server
# Defaults to undefined
# Defaults to lookup('vts::vts_ip', undef, undef, undef)
#
# [*vts_port*]
# (Optional) VTS Server Neutron service port
# Defaults to '8888'
# Defaults to lookup('vts::vts_port', undef, undef, 8888)
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
class tripleo::profile::base::neutron::plugins::ml2::vts (
$vts_url_ip = hiera('vts::vts_ip', undef),
$vts_port = hiera('vts::vts_port', 8888),
$step = hiera('step'),
$vts_url_ip = lookup('vts::vts_ip', undef, undef, undef),
$vts_port = lookup('vts::vts_port', undef, undef, 8888),
$step = Integer(lookup('step')),
) {
if $step >= 4 {

8
manifests/profile/base/neutron/plugins/nsx.pp
View File

@ -20,16 +20,16 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('neutron_plugin_nsx_short_bootstrap_node_name')
# Defaults to lookup('neutron_plugin_nsx_short_bootstrap_node_name', undef, undef, undef)
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
class tripleo::profile::base::neutron::plugins::nsx (
$bootstrap_node = hiera('neutron_plugin_nsx_short_bootstrap_node_name', undef),
$step = Integer(hiera('step')),
$bootstrap_node = lookup('neutron_plugin_nsx_short_bootstrap_node_name', undef, undef, undef),
$step = Integer(lookup('step')),
) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true

8
manifests/profile/base/neutron/plugins/opencontrail.pp
View File

@ -18,16 +18,16 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('contrail_neutron_plugin_short_bootstrap_node_name')
# Defaults to lookup('contrail_neutron_plugin_short_bootstrap_node_name', undef, undef, undef)
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
class tripleo::profile::base::neutron::plugins::opencontrail (
$bootstrap_node = hiera('contrail_neutron_plugin_short_bootstrap_node_name', undef),
$step = Integer(hiera('step')),
$bootstrap_node = lookup('contrail_neutron_plugin_short_bootstrap_node_name', undef, undef, undef),
$step = Integer(lookup('step')),
) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true

40
manifests/profile/base/neutron/server.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('neutron_api_short_bootstrap_node_name')
# Defaults to lookup('neutron_api_short_bootstrap_node_name', undef, undef, undef)
#
# [*certificates_specs*]
# (Optional) The specifications to give to certmonger for the certificate(s)
@ -32,16 +32,16 @@
# service_certificate: <service certificate path>
# service_key: <service key path>
# principal: "haproxy/<overcloud controller fqdn>"
# Defaults to hiera('apache_certificate_specs', {}).
# Defaults to lookup('apache_certificates_specs', undef, undef, {}).
#
# [*dvr_enabled*]
# (Optional) Is dvr enabled, used when no override is passed to
# l3_ha_override to calculate enabling l3 HA.
# Defaults to hiera('neutron::server::router_distributed') or false
# Defaults to lookup('neutron::server::router_distributed', undef, undef, false)
#
# [*enable_internal_tls*]
# (Optional) Whether TLS in the internal network is enabled or not.
# Defaults to hiera('enable_internal_tls', false)
# Defaults to lookup('enable_internal_tls', undef, undef, false)
#
# [*l3_ha_override*]
# (Optional) Override the calculated value for neutron::server::l3_ha
@ -53,19 +53,19 @@
# [*l3_nodes*]
# (Optional) List of nodes running the l3 agent, used when no override
# is passed to l3_ha_override to calculate enabling l3 HA.
# Defaults to hiera('neutron_l3_short_node_names') or []
# Defaults to lookup('neutron_l3_short_node_names', undef, undef, [])
# (we need to default neutron_l3_short_node_names to an empty list
# because some neutron backends disable the l3 agent)
#
# [*neutron_network*]
# (Optional) The network name where the neutron endpoint is listening on.
# This is set by t-h-t.
# Defaults to hiera('neutron_api_network', undef)
# Defaults to lookup('neutron_api_network', undef, undef, undef)
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
# [*tls_proxy_bind_ip*]
# IP on which the TLS proxy will listen on. Required only if
@ -84,21 +84,21 @@
#
# [*designate_api_enabled*]
# (Optional) Indicate whether Designate is available in the deployment.
# Defaults to hiera('designate_api_enabled') or false
# Defaults to lookup('designate_api_enabled', undef, undef, false)
#
class tripleo::profile::base::neutron::server (
$bootstrap_node = hiera('neutron_api_short_bootstrap_node_name', undef),
$certificates_specs = hiera('apache_certificates_specs', {}),
$dvr_enabled = hiera('neutron::server::router_distributed', false),
$enable_internal_tls = hiera('enable_internal_tls', false),
$l3_ha_override = '',
$l3_nodes = hiera('neutron_l3_short_node_names', []),
$neutron_network = hiera('neutron_api_network', undef),
$step = Integer(hiera('step')),
$tls_proxy_bind_ip = undef,
$tls_proxy_fqdn = undef,
$tls_proxy_port = 9696,
$designate_api_enabled = hiera('designate_api_enabled', false),
$bootstrap_node = lookup('neutron_api_short_bootstrap_node_name', undef, undef, undef),
$certificates_specs = lookup('apache_certificates_specs', undef, undef, {}),
$dvr_enabled = lookup('neutron::server::router_distributed', undef, undef, false),
$enable_internal_tls = lookup('enable_internal_tls', undef, undef, false),
$l3_ha_override = '',
$l3_nodes = lookup('neutron_l3_short_node_names', undef, undef, []),
$neutron_network = lookup('neutron_api_network', undef, undef, undef),
$step = Integer(lookup('step')),
$tls_proxy_bind_ip = undef,
$tls_proxy_fqdn = undef,
$tls_proxy_port = 9696,
$designate_api_enabled = lookup('designate_api_enabled', undef, undef, false),
) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true

4
manifests/profile/base/neutron/sfc.pp
View File

@ -24,10 +24,10 @@
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
class tripleo::profile::base::neutron::sfc (
$step = Integer(hiera('step')),
$step = Integer(lookup('step')),
) {
include tripleo::profile::base::neutron

4
manifests/profile/base/neutron/sriov.pp
View File

@ -21,11 +21,11 @@
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
class tripleo::profile::base::neutron::sriov(
$step = Integer(hiera('step'))
$step = Integer(lookup('step'))
) {
include tripleo::profile::base::neutron