openstack/puppet-neutron
Code Issues Proposed changes

Replace legacy facts and use fact hash

Browse Source 
... because the latest lint no longer allows usage of legacy facts and
top scope fact.

Change-Id: Id66d5ae7904998aa8bbf42f3b2a49ec0748507b4
This commit is contained in:
Takashi Kajinami 2023-03-02 11:25:23 +09:00
parent 075e643e60
commit 4f9ea57cb2
80 changed files with 1042 additions and 1040 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
manifests/agents/bagpipe.pp
View File

@ -23,15 +23,15 @@
#
# [*my_as*]
# (required) Private Autonomous System number
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*api_host*]
# (optional) BGP component API host
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*api_port*]
# (optional) BGP component API port
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*dataplane_driver_ipvpn*]
# IP VPN dataplane driver class
@ -43,7 +43,7 @@
#
# [*enable_rtc*]
# Enable Route Target Constraint
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*manage_service*]
# (optional) Whether to start/stop the service
@ -51,11 +51,11 @@
#
# [*mpls_interface*]
# MPLS outgoing interface for Linux and OVS drivers
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*ovs_bridge*]
# OVS bridge to use
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*package_ensure*]
# (optional) The state of the package
@ -63,7 +63,7 @@
#
# [*peers*]
# List of peers' IPs to establish p2p connections
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*proxy_arp*]
# For OVS driver control if VRF will reply ARP messages
@ -76,23 +76,23 @@
#
# [*local_address*]
# (required) Local IP of the server to carry BGP traffic
# Defaults to $::ipaddress
# Defaults to $facts['networking']['ip']
#
class neutron::agents::bagpipe (
$my_as,
$api_host = $::os_service_default,
$api_port = $::os_service_default,
$api_host = $facts['os_service_default'],
$api_port = $facts['os_service_default'],
$dataplane_driver_ipvpn = 'ovs',
$enabled = true,
$enable_rtc = $::os_service_default,
$enable_rtc = $facts['os_service_default'],
$manage_service = true,
$mpls_interface = $::os_service_default,
$ovs_bridge = $::os_service_default,
$mpls_interface = $facts['os_service_default'],
$ovs_bridge = $facts['os_service_default'],
$package_ensure = 'present',
$peers = $::os_service_default,
$peers = $facts['os_service_default'],
$proxy_arp = false,
$purge_config = false,
$local_address = $::ipaddress,
$local_address = $facts['networking']['ip'],
) {
include neutron::deps

4
manifests/agents/bgp_dragent.pp
View File

@ -39,7 +39,7 @@
#
# [*bgp_router_id*]
# (Optional) The BGP router ID.
# Defaults to $::ipaddress
# Defaults to $facts['networking']['ip']
#
# [*purge_config*]
# (Optional) Whether to set only the specified config options in the BGP dragent config.
@ -50,7 +50,7 @@ class neutron::agents::bgp_dragent(
$enabled = true,
$manage_service = true,
$bgp_speaker_driver = 'neutron_dynamic_routing.services.bgp.agent.driver.os_ken.driver.OsKenBgpDriver',
$bgp_router_id = $::ipaddress,
$bgp_router_id = $facts['networking']['ip'],
$purge_config = false,
) {

72
manifests/agents/dhcp.pp
View File

@ -15,7 +15,7 @@
# Defaults to true
#
# [*debug*]
# (optional) Show debugging output in log. Defaults to $::os_service_default.
# (optional) Show debugging output in log. Defaults to $facts['os_service_default'].
#
# [*state_path*]
# (optional) Where to store dnsmasq state files. This directory must be
@ -25,14 +25,14 @@
# (optional) The DHCP agent will resync its state with Neutron to recover
# from any transient notification or rpc errors. The interval is number of
# seconds between attempts.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*interface_driver*]
# (optional) The driver used to manage the virtual interface.
# Defaults to 'neutron.agent.linux.interface.OVSInterfaceDriver'.
#
# [*dhcp_driver*]
# (optional) Defaults to $::os_service_default.
# (optional) Defaults to $facts['os_service_default'].
#
# [*root_helper*]
# (optional) Defaults to 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf'.
@ -41,29 +41,29 @@
#
# [*dnsmasq_config_file*]
# (optional) Override the default dnsmasq settings with this file.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*dnsmasq_dns_servers*]
# (optional) List of servers to use as dnsmasq forwarders.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*dnsmasq_base_log_dir*]
# (optional) base log dir for dnsmasq logging.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*dnsmasq_local_resolv*]
# (optional) Enables the dnsmasq service to provide name resolution for instances
# via DNS resolvers on the host running the DHCP agent.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*dnsmasq_lease_max*]
# (optional) Limit number of leases to prevent a denial-of-service.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*dnsmasq_enable_addr6_list*]
# (optional) Enable dhcp-host entry with list of addresses when port has
# multiple IPv6 addresses in the same subnet.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*enable_isolated_metadata*]
# (optional) enable metadata support on isolated networks.
@ -82,7 +82,7 @@
#
# [*dhcp_broadcast_reply*]
# (optional) Use broadcast in DHCP replies
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*purge_config*]
# (optional) Whether to set only the specified config options
@ -92,67 +92,67 @@
# [*availability_zone*]
# (optional) The availability zone of the agent.
# Neutron will only schedule dhcp on the agent based on availability zone
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*ovs_integration_bridge*]
# (optional) Name of Open vSwitch bridge to use
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*ovsdb_connection*]
# (optional) The URI used to connect to the local OVSDB server
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*ovsdb_agent_ssl_key_file*]
# (optional) The SSL key file to use for Neutron agents to connect to OVSDB
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*ovsdb_agent_ssl_cert_file*]
# (optional) The SSL cert file to use for Neutron agents to connect to OVSDB
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*ovsdb_agent_ssl_ca_file*]
# (optional) The SSL CA cert file to use for Neutron agents to connect to OVSDB
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*report_interval*]
# (optional) Set the agent report interval. By default the global report
# interval in neutron.conf ([agent]/report_interval) is used. This parameter
# can be used to override the reporting interval for the dhcp-agent.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*rpc_response_max_timeout*]
# (Optional) Maximum seconds to wait for a response from an RPC call
# Defaults to: $::os_service_default
# Defaults to: $facts['os_service_default']
#
class neutron::agents::dhcp (
$package_ensure = present,
$enabled = true,
$manage_service = true,
$debug = $::os_service_default,
$debug = $facts['os_service_default'],
$state_path = '/var/lib/neutron',
$resync_interval = $::os_service_default,
$resync_interval = $facts['os_service_default'],
$interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver',
$dhcp_driver = $::os_service_default,
$dhcp_driver = $facts['os_service_default'],
$root_helper = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf',
$dnsmasq_config_file = $::os_service_default,
$dnsmasq_dns_servers = $::os_service_default,
$dnsmasq_base_log_dir = $::os_service_default,
$dnsmasq_local_resolv = $::os_service_default,
$dnsmasq_lease_max = $::os_service_default,
$dnsmasq_enable_addr6_list = $::os_service_default,
$dnsmasq_config_file = $facts['os_service_default'],
$dnsmasq_dns_servers = $facts['os_service_default'],
$dnsmasq_base_log_dir = $facts['os_service_default'],
$dnsmasq_local_resolv = $facts['os_service_default'],
$dnsmasq_lease_max = $facts['os_service_default'],
$dnsmasq_enable_addr6_list = $facts['os_service_default'],
$enable_isolated_metadata = false,
$enable_force_metadata = false,
$enable_metadata_network = false,
$dhcp_broadcast_reply = $::os_service_default,
$dhcp_broadcast_reply = $facts['os_service_default'],
$purge_config = false,
$availability_zone = $::os_service_default,
$ovs_integration_bridge = $::os_service_default,
$ovsdb_connection = $::os_service_default,
$ovsdb_agent_ssl_key_file = $::os_service_default,
$ovsdb_agent_ssl_cert_file = $::os_service_default,
$ovsdb_agent_ssl_ca_file = $::os_service_default,
$report_interval = $::os_service_default,
$rpc_response_max_timeout = $::os_service_default,
$availability_zone = $facts['os_service_default'],
$ovs_integration_bridge = $facts['os_service_default'],
$ovsdb_connection = $facts['os_service_default'],
$ovsdb_agent_ssl_key_file = $facts['os_service_default'],
$ovsdb_agent_ssl_cert_file = $facts['os_service_default'],
$ovsdb_agent_ssl_ca_file = $facts['os_service_default'],
$report_interval = $facts['os_service_default'],
$rpc_response_max_timeout = $facts['os_service_default'],
) {
include neutron::deps

28
manifests/agents/l2gw.pp
View File

@ -19,12 +19,12 @@
#
# [*debug*]
# (optional) Print debug info in logs
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*ovsdb_hosts*]
# (optional) OVSDB server tuples in the format
# Example: ovsdb_hosts = 'ovsdb1:16.95.16.1:6632,ovsdb2:16.95.16.2:6632'
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*enable_manager*]
# (optional) connection can be initiated by the ovsdb server.
@ -37,28 +37,28 @@
# [*l2_gw_agent_priv_key_base_path*]
# (optional) Base path to private key file(s).
# Example: l2_gw_agent_priv_key_base_path = '/home/someuser/keys'
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*l2_gw_agent_cert_base_path*]
# (optional) Base path to cert file(s).
# Example: l2_gw_agent_cert_base_path = '/home/someuser/certs'
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*l2_gw_agent_ca_cert_base_path*]
# (optional) Base path to ca cert file(s).
# Example: l2_gw_agent_ca_cert_base_path = '/home/someuser/ca_certs'
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*periodic_interval*]
# (optional) The L2 gateway agent checks connection state with the OVSDB
# servers. The interval is number of seconds between attempts.
# Example: periodic_interval = 20
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*max_connection_retries*]
# (optional) The L2 gateway agent retries to connect to the OVSDB server
# Example: max_connection_retries = 10
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*socket_timeout*]
# (optional) socket timeout
@ -73,15 +73,15 @@ class neutron::agents::l2gw (
$package_ensure = 'present',
$enabled = true,
$manage_service = true,
$debug = $::os_service_default,
$ovsdb_hosts = $::os_service_default,
$debug = $facts['os_service_default'],
$ovsdb_hosts = $facts['os_service_default'],
$enable_manager = false,
$manager_table_listening_port = '6632',
$l2_gw_agent_priv_key_base_path = $::os_service_default,
$l2_gw_agent_cert_base_path = $::os_service_default,
$l2_gw_agent_ca_cert_base_path = $::os_service_default,
$periodic_interval = $::os_service_default,
$max_connection_retries = $::os_service_default,
$l2_gw_agent_priv_key_base_path = $facts['os_service_default'],
$l2_gw_agent_cert_base_path = $facts['os_service_default'],
$l2_gw_agent_ca_cert_base_path = $facts['os_service_default'],
$periodic_interval = $facts['os_service_default'],
$max_connection_retries = $facts['os_service_default'],
$socket_timeout = '30',
$purge_config = false,
) {

64
manifests/agents/l3.pp
View File

@ -20,7 +20,7 @@
#
# [*debug*]
# (optional) Print debug info in logs
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*interface_driver*]
# (optional) The driver used to manage the virtual interface.
@ -28,23 +28,23 @@
#
# [*handle_internal_only_routers*]
# (optional) L3 Agent will handle non-external routers
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*metadata_port*]
# (optional) The port of the metadata server
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*periodic_interval*]
# (optional) seconds between re-sync routers' data if needed
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*periodic_fuzzy_delay*]
# (optional) seconds to start to sync routers' data after starting agent
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*enable_metadata_proxy*]
# (optional) can be set to False if the Nova metadata server is not available
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*ha_enabled*]
# (optional) Enabled or not HA for L3 agent.
@ -56,7 +56,7 @@
#
# [*ha_vrrp_auth_password*]
# (optional) VRRP authentication password. Required if ha_enabled = true.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*ha_vrrp_advert_int*]
# (optional) The advertisement interval in seconds.
@ -77,21 +77,21 @@
# [*availability_zone*]
# (optional) The availability zone of the agent.
# Neutron will only schedule routers on the agent based on availability zone
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*extensions*]
# (optional) List of the L3 agent extensions to enable.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*report_interval*]
# (optional) Set the agent report interval. By default the global report
# interval in neutron.conf ([agent]/report_interval) is used. This parameter
# can be used to override the reporting interval for l3-agent.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*rpc_response_max_timeout*]
# (Optional) Maximum seconds to wait for a response from an RPC call
# Defaults to: $::os_service_default
# Defaults to: $facts['os_service_default']
#
# [*radvd_user*]
# (optional) The username passed to radvd, used to drop root privileges and
@ -99,55 +99,55 @@
# If no user specified, the user executing the L3 agent will be passed. If
# "root" specified, because radvd is spawned as root, no "username" parameter
# will be passed.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*ovs_integration_bridge*]
# (optional) Name of Open vSwitch bridge to use
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*network_log_rate_limit*]
# (Optional) Maximum packets logging per second.
# Used by logging service plugin.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
# Minimum possible value is 100.
#
# [*network_log_burst_limit*]
# (Optional) Maximum number of packets per rate_limit.
# Used by logging service plugin.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
# Minimum possible value is 25.
#
# [*network_log_local_output_log_base*]
# (Optional) Output logfile path on agent side, default syslog file.
# Used by logging service plugin.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
class neutron::agents::l3 (
$package_ensure = 'present',
$enabled = true,
$manage_service = true,
$debug = $::os_service_default,
$debug = $facts['os_service_default'],
$interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver',
$handle_internal_only_routers = $::os_service_default,
$metadata_port = $::os_service_default,
$periodic_interval = $::os_service_default,
$periodic_fuzzy_delay = $::os_service_default,
$enable_metadata_proxy = $::os_service_default,
$handle_internal_only_routers = $facts['os_service_default'],
$metadata_port = $facts['os_service_default'],
$periodic_interval = $facts['os_service_default'],
$periodic_fuzzy_delay = $facts['os_service_default'],
$enable_metadata_proxy = $facts['os_service_default'],
$ha_enabled = false,
$ha_vrrp_auth_type = 'PASS',
$ha_vrrp_auth_password = $::os_service_default,
$ha_vrrp_auth_password = $facts['os_service_default'],
$ha_vrrp_advert_int = '3',
$agent_mode = 'legacy',
$purge_config = false,
$availability_zone = $::os_service_default,
$extensions = $::os_service_default,
$report_interval = $::os_service_default,
$rpc_response_max_timeout = $::os_service_default,
$radvd_user = $::os_service_default,
$ovs_integration_bridge = $::os_service_default,
$network_log_rate_limit = $::os_service_default,
$network_log_burst_limit = $::os_service_default,
$network_log_local_output_log_base = $::os_service_default,
$availability_zone = $facts['os_service_default'],
$extensions = $facts['os_service_default'],
$report_interval = $facts['os_service_default'],
$rpc_response_max_timeout = $facts['os_service_default'],
$radvd_user = $facts['os_service_default'],
$ovs_integration_bridge = $facts['os_service_default'],
$network_log_rate_limit = $facts['os_service_default'],
$network_log_burst_limit = $facts['os_service_default'],
$network_log_local_output_log_base = $facts['os_service_default'],
) {
include neutron::deps

52
manifests/agents/metadata.pp
View File

@ -18,55 +18,55 @@
# Defaults to true
#
# [*debug*]
# Debug. Defaults to $::os_service_default.
# Debug. Defaults to $facts['os_service_default'].
#
# [*auth_ca_cert*]
# CA cert to check against with for ssl keystone. (Defaults to $::os_service_default)
# CA cert to check against with for ssl keystone. (Defaults to $facts['os_service_default'])
#
# [*nova_client_cert*]
# Client certificate for nova metadata api server. (Defaults to $::os_service_default)
# Client certificate for nova metadata api server. (Defaults to $facts['os_service_default'])
#
# [*nova_client_priv_key*]
# Private key of client certificate. (Defaults to $::os_service_default)
# Private key of client certificate. (Defaults to $facts['os_service_default'])
#
# [*metadata_host*]
# The hostname of the metadata service. Defaults to $::os_service_default.
# The hostname of the metadata service. Defaults to $facts['os_service_default'].
#
# [*metadata_port*]
# The TCP port of the metadata service. Defaults to $::os_service_default.
# The TCP port of the metadata service. Defaults to $facts['os_service_default'].
#
# [*metadata_protocol*]
# The protocol to use for requests to Nova metadata server. Defaults to $::os_service_default.
# The protocol to use for requests to Nova metadata server. Defaults to $facts['os_service_default'].
#
# [*metadata_workers*]
# (optional) Number of separate worker processes to spawn. Greater than 0
# launches that number of child processes as workers. The parent process
# manages them.
# Defaults to: $::os_workers
# Defaults to: $facts['os_workers']
#
# [*metadata_backlog*]
# (optional) Number of backlog requests to configure the metadata server socket with.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*metadata_memory_cache_ttl*]
# (optional) Specifies time in seconds a metadata cache entry is valid in
# memory caching backend.
# Set to 0 will cause cache entries to never expire.
# Set to $::os_service_default or false to disable cache.
# Set to $facts['os_service_default'] or false to disable cache.
#
# [*metadata_insecure*]
# (optional) Allow to perform insecure SSL (https) requests to nova metadata.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*report_interval*]
# (optional) Set the agent report interval. By default the global report
# interval in neutron.conf ([agent]/report_interval) is used. This parameter
# can be used to override the reporting interval for the sriov-agent.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*rpc_response_max_timeout*]
# (Optional) Maximum seconds to wait for a response from an RPC call
# Defaults to: $::os_service_default
# Defaults to: $facts['os_service_default']
#
# [*purge_config*]
# (optional) Whether to set only the specified config options
@ -78,19 +78,19 @@ class neutron::agents::metadata (
$package_ensure = 'present',
$enabled = true,
$manage_service = true,
$debug = $::os_service_default,
$auth_ca_cert = $::os_service_default,
$metadata_host = $::os_service_default,
$metadata_port = $::os_service_default,
$metadata_protocol = $::os_service_default,
$metadata_workers = $::os_workers,
$metadata_backlog = $::os_service_default,
$metadata_memory_cache_ttl = $::os_service_default,
$metadata_insecure = $::os_service_default,
$nova_client_cert = $::os_service_default,
$nova_client_priv_key = $::os_service_default,
$report_interval = $::os_service_default,
$rpc_response_max_timeout = $::os_service_default,
$debug = $facts['os_service_default'],
$auth_ca_cert = $facts['os_service_default'],
$metadata_host = $facts['os_service_default'],
$metadata_port = $facts['os_service_default'],
$metadata_protocol = $facts['os_service_default'],
$metadata_workers = $facts['os_workers'],
$metadata_backlog = $facts['os_service_default'],
$metadata_memory_cache_ttl = $facts['os_service_default'],
$metadata_insecure = $facts['os_service_default'],
$nova_client_cert = $facts['os_service_default'],
$nova_client_priv_key = $facts['os_service_default'],
$report_interval = $facts['os_service_default'],
$rpc_response_max_timeout = $facts['os_service_default'],
$purge_config = false,
) {

16
manifests/agents/metering.pp
View File

@ -32,7 +32,7 @@
# Defaults to true
#
# [*debug*]
# (optional) Show debugging output in log. Defaults to $::os_service_default.
# (optional) Show debugging output in log. Defaults to $facts['os_service_default'].
#
# [*interface_driver*]
# (optional) The driver used to manage the virtual interface.
@ -52,13 +52,13 @@
#
# [*rpc_response_max_timeout*]
# (Optional) Maximum seconds to wait for a response from an RPC call
# Defaults to: $::os_service_default
# Defaults to: $facts['os_service_default']
#
# [*agent_report_interval*]
# (optional) Set the agent report interval. By default the global report
# interval in neutron.conf ([agent]/report_interval) is used. This parameter
# can be used to override the reporting interval for the metering-agent.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*purge_config*]
# (optional) Whether to set only the specified config options
@ -69,13 +69,13 @@ class neutron::agents::metering (
$package_ensure = present,
$enabled = true,
$manage_service = true,
$debug = $::os_service_default,
$debug = $facts['os_service_default'],
$interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver',
$driver = 'neutron.services.metering.drivers.noop.noop_driver.NoopMeteringDriver',
$measure_interval = $::os_service_default,
$report_interval = $::os_service_default,
$rpc_response_max_timeout = $::os_service_default,
$agent_report_interval = $::os_service_default,
$measure_interval = $facts['os_service_default'],
$report_interval = $facts['os_service_default'],
$rpc_response_max_timeout = $facts['os_service_default'],
$agent_report_interval = $facts['os_service_default'],
$purge_config = false,
) {

14
manifests/agents/ml2/linuxbridge.pp
View File

@ -47,7 +47,7 @@
#
# [*rpc_response_max_timeout*]
# (Optional) Maximum seconds to wait for a response from an RPC call
# Defaults to: $::os_service_default
# Defaults to: $facts['os_service_default']
#
# [*l2_population*]
# (optional) Extension to use alongside ml2 plugin's l2population
@ -78,12 +78,12 @@ class neutron::agents::ml2::linuxbridge (
$manage_service = true,
$tunnel_types = [],
$local_ip = false,
$vxlan_group = $::os_service_default,
$vxlan_ttl = $::os_service_default,
$vxlan_tos = $::os_service_default,
$polling_interval = $::os_service_default,
$rpc_response_max_timeout = $::os_service_default,
$l2_population = $::os_service_default,
$vxlan_group = $facts['os_service_default'],
$vxlan_ttl = $facts['os_service_default'],
$vxlan_tos = $facts['os_service_default'],
$polling_interval = $facts['os_service_default'],
$rpc_response_max_timeout = $facts['os_service_default'],
$l2_population = $facts['os_service_default'],
$physical_interface_mappings = [],
$bridge_mappings = [],
$firewall_driver = 'iptables',

4
manifests/agents/ml2/macvtap.pp
View File

@ -19,7 +19,7 @@
# [*polling_interval*]
# (optional) The number of seconds the agent will wait between
# polling for local device changes.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*physical_interface_mappings*]
# (optional) List of <physical_network>:<physical_interface>
@ -35,7 +35,7 @@ class neutron::agents::ml2::macvtap (
$package_ensure = 'present',
$enabled = true,
$manage_service = true,
$polling_interval = $::os_service_default,
$polling_interval = $facts['os_service_default'],
$physical_interface_mappings = [],
$purge_config = false,
) {

22
manifests/agents/ml2/mlnx.pp
View File

@ -26,24 +26,24 @@
# All physical networks listed in network_vlan_ranges
# on the server should have mappings to appropriate
# interfaces on each agent.
# Value should be of type array, Defaults to $::os_service_default
# Value should be of type array, Defaults to $facts['os_service_default']
#
# [*polling_interval*]
# (optional) The number of seconds the agent will wait between
# polling for local device changes.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*multi_interface_driver_mappings*]
# (optional) A per physnet interface driver mapping used by
# multidriver interface driver to manage the virtual
# interface per physnet. a virtual network e.g vxlan
# will map to the 'nil' physnet.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*ipoib_physical_interface*]
# (optional) Name of the IPoIB root device to use with
# ipoib interface driver.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*enable_multi_interface_driver_cache_maintenance*]
# (optional) Enable periodic job to perform maintenance to the
@ -57,10 +57,10 @@ class neutron::agents::ml2::mlnx (
$enabled = true,
$manage_service = true,
$manage_package = true,
$physical_interface_mappings = $::os_service_default,
$polling_interval = $::os_service_default,
$multi_interface_driver_mappings = $::os_service_default,
$ipoib_physical_interface = $::os_service_default,
$physical_interface_mappings = $facts['os_service_default'],
$polling_interval = $facts['os_service_default'],
$multi_interface_driver_mappings = $facts['os_service_default'],
$ipoib_physical_interface = $facts['os_service_default'],
$enable_multi_interface_driver_cache_maintenance = false,
) {
@ -74,15 +74,15 @@ class neutron::agents::ml2::mlnx (
$mlnx_plugin_package = $::neutron::params::mlnx_plugin_package
neutron_mlnx_agent_config {
'eswitch/physical_interface_mappings': value => pick(join(any2array($physical_interface_mappings), ','), $::os_service_default);
'eswitch/physical_interface_mappings': value => pick(join(any2array($physical_interface_mappings), ','), $facts['os_service_default']);
'agent/polling_interval' : value => $polling_interval;
}
eswitchd_config {
'DAEMON/fabrics': value => pick(join(any2array($physical_interface_mappings), ','), $::os_service_default);
'DAEMON/fabrics': value => pick(join(any2array($physical_interface_mappings), ','), $facts['os_service_default']);
}
$mappings_array = pick(join(any2array($multi_interface_driver_mappings), ','), $::os_service_default);
$mappings_array = pick(join(any2array($multi_interface_driver_mappings), ','), $facts['os_service_default']);
neutron_dhcp_agent_config {
'DEFAULT/multi_interface_driver_mappings' : value => $mappings_array;

48
manifests/agents/ml2/networking_baremetal.pp
View File

@ -22,19 +22,19 @@
# [*cafile*]
# (optional) PEM encoded Certificate Authority to use when verifying HTTPs
# connections.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*certfile*]
# (optional) PEM encoded client certificate cert file
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*keyfile*]
# (optional) PEM encoded client certificate key file
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*insecure*]
# (optional) Verify HTTPS connections. (boolean)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*auth_type*]
# (optional) An authentication type to use with an OpenStack Identity server.
@ -49,7 +49,7 @@
#
# [*endpoint_override*]
# (optional) The ironic endpoint URL for requests
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*user_domain_name*]
# (Optional) Name of domain for $username
@ -69,24 +69,24 @@
#
# [*system_scope*]
# (Optional) Scope for system operations
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*region_name*]
# (optional) Name of region to use. Useful if keystone manages more than one
# region.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*status_code_retry_delay*]
# (optional) Interval between retries in case of conflict error (HTTP 409).
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*status_code_retries*]
# (optional) Maximum number of retries in case of conflict error (HTTP 409).
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*valid_interfaces*]
# (Optional) List of interfaces, in order of preference for endpoint URL.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*purge_config*]
# (optional) Whether to set only the specified config options in the
@ -98,31 +98,31 @@
# interval in neutron.conf ([agent]/report_interval) is used. This parameter
# can be used to override the reporting interval for the
# ironic-neutron-agent.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
class neutron::agents::ml2::networking_baremetal (
$password,
$enabled = true,
$manage_service = true,
$package_ensure = 'present',
$endpoint_override = $::os_service_default,
$cafile = $::os_service_default,
$certfile = $::os_service_default,
$keyfile = $::os_service_default,
$insecure = $::os_service_default,
$endpoint_override = $facts['os_service_default'],
$cafile = $facts['os_service_default'],
$certfile = $facts['os_service_default'],
$keyfile = $facts['os_service_default'],
$insecure = $facts['os_service_default'],
$auth_type = 'password',
$auth_url = 'http://127.0.0.1:5000',
$user_domain_name = 'Default',
$username = 'ironic',
$project_domain_name = 'Default',
$project_name = 'services',
$system_scope = $::os_service_default,
$region_name = $::os_service_default,
$status_code_retry_delay = $::os_service_default,
$status_code_retries = $::os_service_default,
$valid_interfaces = $::os_service_default,
$system_scope = $facts['os_service_default'],
$region_name = $facts['os_service_default'],
$status_code_retry_delay = $facts['os_service_default'],
$status_code_retries = $facts['os_service_default'],
$valid_interfaces = $facts['os_service_default'],
$purge_config = false,
$report_interval = $::os_service_default,
$report_interval = $facts['os_service_default'],
) {
include neutron::deps
@ -136,8 +136,8 @@ class neutron::agents::ml2::networking_baremetal (
$project_name_real = $project_name
$project_domain_name_real = $project_domain_name
} else {
$project_name_real = $::os_service_default
$project_domain_name_real = $::os_service_default
$project_name_real = $facts['os_service_default']
$project_domain_name_real = $facts['os_service_default']
}
ironic_neutron_agent_config {

134
manifests/agents/ml2/ovs.pp
View File

@ -44,25 +44,25 @@
#
# [*ovsdb_timeout*]
# (Optional) The timeout in seconds for OVSDB commands.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*of_connect_timeout*]
# (Optional) Timeout in seconds to wait for the local switch
# connecting to the controller.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*of_request_timeout*]
# (Optional) Timeout in seconds to wait for a single OpenFlow request.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*of_inactivity_probe*]
# (Optional) The inactivity_probe interval in second for the local switch
# connection to the controller. A value of 0 disables inactivity probes.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*integration_bridge*]
# (optional) Integration bridge in OVS
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*tunnel_types*]
# (optional) List of types of tunnels to use when utilizing tunnels,
@ -76,36 +76,36 @@
#
# [*tunnel_bridge*]
# (optional) Bridge used to transport tunnels
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*vxlan_udp_port*]
# (optional) The UDP port to use for VXLAN tunnels.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*polling_interval*]
# (optional) The number of seconds the agent will wait between
# polling for local device changes.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*report_interval*]
# (optional) Set the agent report interval. By default the global report
# interval in neutron.conf ([agent]/report_interval) is used. This parameter
# can be used to override the reporting interval for the openvswitch-agent.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*rpc_response_max_timeout*]
# (Optional) Maximum seconds to wait for a response from an RPC call
# Defaults to: $::os_service_default
# Defaults to: $facts['os_service_default']
#
# [*l2_population*]
# (optional) Extension to use alongside ml2 plugin's l2population
# mechanism driver.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*arp_responder*]
# (optional) Enable or not the ARP responder.
# Recommended when using l2 population mechanism driver.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*firewall_driver*]
# (optional) Firewall driver for realizing neutron security group function.
@ -114,12 +114,12 @@
# [*enable_distributed_routing*]
# (optional) Set to True on L2 agents to enable support
# for distributed virtual routing.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*drop_flows_on_start*]
# (optional) Set to True to drop all flows during agent start for a clean
# flow tables resetting
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*manage_vswitch*]
# (optional) This boolean is used to indicate if this class should manage the
@ -131,23 +131,23 @@
#
# [*extensions*]
# (optional) Extensions list to use
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*int_peer_patch_port*]
# (optional) Peer patch port in integration bridge for tunnel bridge
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*tun_peer_patch_port*]
# (optional) Peer patch port in tunnel bridge for integration bridge
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*datapath_type*]
# (optional) Datapath type for ovs bridges
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*vhostuser_socket_dir*]
# (optional) The vhost-user socket directory for OVS
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*purge_config*]
# (optional) Whether to set only the specified config options
@ -161,27 +161,27 @@
# [*enable_security_group*]
# (optional) Controls whether the agent supports security
# groups or not.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*permitted_ethertypes*]
# (optional) List of additional ethernet types to be configured
# on the firewall.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*minimize_polling*]
# (optional) Minimize polling by monitoring ovsdb for interface
# changes. (boolean value)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*tunnel_csum*]
# (optional) Set or un-set the tunnel header checksum on
# outgoing IP packet carrying GRE/VXLAN tunnel.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*bridge_mac_table_size*]
# (optional) The maximum number of MAC addresses to learn on a bridge managed
# by the Neutron OVS agent.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*igmp_snooping_enable*]
# (Optional) Enable IGMP snooping for integration bridge. If this
@ -193,7 +193,7 @@
# The switch will send unregistered multicast packets only to ports
# connected to multicast routers. This option is used by the ML2/OVS
# mechanism driver for Neutron.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*resource_provider_bandwidths*]
# (optional) List of <bridge>:<egress_bw>:<ingress_bw>
@ -216,7 +216,7 @@
# [*resource_provider_default_hypervisor*]
# (optional) The default hypervisor name used to locate the parent of
# the resource provider.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*resource_provider_inventory_defaults*]
# (optional) Key:value pairs to specify defaults used while reporting packet
@ -232,76 +232,76 @@
# (optional) When set to True, the accepted egress unicast traffic will not
# use action NORMAL. The accepted egress packets will be taken care of in the
# final egress tables direct output flows for unicast traffic. (boolean value)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*network_log_rate_limit*]
# (Optional) Maximum packets logging per second.
# Used by logging service plugin.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
# Minimum possible value is 100.
#
# [*network_log_burst_limit*]
# (Optional) Maximum number of packets per rate_limit.
# Used by logging service plugin.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
# Minimum possible value is 25.
#
# [*network_log_local_output_log_base*]
# (Optional) Output logfile path on agent side, default syslog file.
# Used by logging service plugin.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
class neutron::agents::ml2::ovs (
$package_ensure = 'present',
$enabled = true,
$manage_service = true,
$extensions = $::os_service_default,
$extensions = $facts['os_service_default'],
$bridge_uplinks = [],
$bridge_mappings = [],
$ovsdb_timeout = $::os_service_default,
$of_connect_timeout = $::os_service_default,
$of_request_timeout = $::os_service_default,
$of_inactivity_probe = $::os_service_default,
$integration_bridge = $::os_service_default,
$ovsdb_timeout = $facts['os_service_default'],
$of_connect_timeout = $facts['os_service_default'],
$of_request_timeout = $facts['os_service_default'],
$of_inactivity_probe = $facts['os_service_default'],
$integration_bridge = $facts['os_service_default'],
$tunnel_types = [],
$local_ip = false,
$tunnel_bridge = $::os_service_default,
$vxlan_udp_port = $::os_service_default,
$polling_interval = $::os_service_default,
$report_interval = $::os_service_default,
$rpc_response_max_timeout = $::os_service_default,
$l2_population = $::os_service_default,
$arp_responder = $::os_service_default,
$tunnel_bridge = $facts['os_service_default'],
$vxlan_udp_port = $facts['os_service_default'],
$polling_interval = $facts['os_service_default'],
$report_interval = $facts['os_service_default'],
$rpc_response_max_timeout = $facts['os_service_default'],
$l2_population = $facts['os_service_default'],
$arp_responder = $facts['os_service_default'],
$firewall_driver = 'iptables_hybrid',
$enable_distributed_routing = $::os_service_default,
$drop_flows_on_start = $::os_service_default,
$enable_distributed_routing = $facts['os_service_default'],
$drop_flows_on_start = $facts['os_service_default'],
$manage_vswitch = true,
$int_peer_patch_port = $::os_service_default,
$tun_peer_patch_port = $::os_service_default,
$datapath_type = $::os_service_default,
$vhostuser_socket_dir = $::os_service_default,
$int_peer_patch_port = $facts['os_service_default'],
$tun_peer_patch_port = $facts['os_service_default'],
$datapath_type = $facts['os_service_default'],
$vhostuser_socket_dir = $facts['os_service_default'],
$purge_config = false,
$enable_dpdk = false,
$enable_security_group = $::os_service_default,
$permitted_ethertypes = $::os_service_default,
$minimize_polling = $::os_service_default,
$tunnel_csum = $::os_service_default,
$bridge_mac_table_size = $::os_service_default,
$igmp_snooping_enable = $::os_service_default,
$enable_security_group = $facts['os_service_default'],
$permitted_ethertypes = $facts['os_service_default'],
$minimize_polling = $facts['os_service_default'],
$tunnel_csum = $facts['os_service_default'],
$bridge_mac_table_size = $facts['os_service_default'],
$igmp_snooping_enable = $facts['os_service_default'],
$resource_provider_bandwidths = [],
$resource_provider_packet_processing_without_direction
= [],
$resource_provider_packet_processing_with_direction
= [],
$resource_provider_hypervisors = [],
$resource_provider_default_hypervisor = $::os_service_default,
$resource_provider_default_hypervisor = $facts['os_service_default'],
$resource_provider_inventory_defaults = {},
$resource_provider_packet_processing_inventory_defaults
= {},
$explicitly_egress_direct = $::os_service_default,
$network_log_rate_limit = $::os_service_default,
$network_log_burst_limit = $::os_service_default,
$network_log_local_output_log_base = $::os_service_default,
$explicitly_egress_direct = $facts['os_service_default'],
$network_log_rate_limit = $facts['os_service_default'],
$network_log_burst_limit = $facts['os_service_default'],
$network_log_local_output_log_base = $facts['os_service_default'],
) {
include neutron::deps
@ -389,31 +389,31 @@ class neutron::agents::ml2::ovs (
if ($resource_provider_bandwidths != []) {
$resource_provider_bandwidths_real = join(any2array($resource_provider_bandwidths), ',')
} else {
$resource_provider_bandwidths_real = $::os_service_default
$resource_provider_bandwidths_real = $facts['os_service_default']
}
if ($resource_provider_hypervisors != []){
$resource_provider_hypervisors_real = join(any2array($resource_provider_hypervisors), ',')
} else {
$resource_provider_hypervisors_real = $::os_service_default
$resource_provider_hypervisors_real = $facts['os_service_default']
}
if ($resource_provider_packet_processing_without_direction != []){
$resource_provider_packet_processing_without_direction_real =
join(any2array($resource_provider_packet_processing_without_direction), ',')
} else {
$resource_provider_packet_processing_without_direction_real = $::os_service_default
$resource_provider_packet_processing_without_direction_real = $facts['os_service_default']
}
if ($resource_provider_packet_processing_with_direction != []){
$resource_provider_packet_processing_with_direction_real =
join(any2array($resource_provider_packet_processing_with_direction), ',')
} else {
$resource_provider_packet_processing_with_direction_real = $::os_service_default
$resource_provider_packet_processing_with_direction_real = $facts['os_service_default']
}
if empty($resource_provider_inventory_defaults) {
$resource_provider_inventory_defaults_real = $::os_service_default
$resource_provider_inventory_defaults_real = $facts['os_service_default']
} else {
if ($resource_provider_inventory_defaults =~ Hash){
$resource_provider_inventory_defaults_real =
@ -425,7 +425,7 @@ class neutron::agents::ml2::ovs (
}
if empty($resource_provider_packet_processing_inventory_defaults) {
$resource_provider_packet_processing_inventory_defaults_real = $::os_service_default
$resource_provider_packet_processing_inventory_defaults_real = $facts['os_service_default']
} else {
if ($resource_provider_packet_processing_inventory_defaults =~ Hash){
$resource_provider_packet_processing_inventory_defaults_real =
@ -540,7 +540,7 @@ class neutron::agents::ml2::ovs (
tag => ['neutron-service', 'neutron-db-sync-service'],
}
if ($::osfamily == 'Redhat') {
if ($facts['os']['family'] == 'Redhat') {
# NOTE(tkajinam): The service should not be started in a running system.
# DO NOT define ensure so the service status is not
# changed.

38
manifests/agents/ml2/sriov.pp
View File

@ -38,11 +38,11 @@
# All physical networks listed in network_vlan_ranges
# on the server should have mappings to appropriate
# interfaces on each agent.
# Value should be of type array, Defaults to $::os_service_default
# Value should be of type array, Defaults to $facts['os_service_default']
#
# [*rpc_response_max_timeout*]
# (Optional) Maximum seconds to wait for a response from an RPC call
# Defaults to: $::os_service_default
# Defaults to: $facts['os_service_default']
#
# [*polling_interval*]
# (optional) The number of seconds the agent will wait between
@ -53,7 +53,7 @@
# (optional) Set the agent report interval. By default the global report
# interval in neutron.conf ([agent]/report_interval) is used. This parameter
# can be used to override the reporting interval for the sriov-agent.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*exclude_devices*]
# (optional) Array of <network_device>:<excluded_devices> mapping
@ -61,11 +61,11 @@
# that should not be used for virtual networking. excluded_devices is a
# semicolon separated list of virtual functions to exclude from network_device.
# The network_device in the mapping should appear in the physical_device_mappings list.
# Value should be of type array, Defaults to $::os_service_default
# Value should be of type array, Defaults to $facts['os_service_default']
#
# [*extensions*]
# (optional) Extensions list to use
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*purge_config*]
# (optional) Whether to set only the specified config options
@ -77,7 +77,7 @@
# VFs to be exposed per physical interface.
# For example, to configure two interface with number of VFs, specify
# it as ["eth1:4", "eth2:10"]
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*resource_provider_bandwidths*]
# (optional) List of <network_device>:<egress_bw>:<ingress_bw>
@ -90,7 +90,7 @@
# [*resource_provider_default_hypervisor*]
# (optional) The default hypervisor name used to locate the parent of
# the resource provider.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*resource_provider_inventory_defaults*]
# (optional) Key:value pairs to specify defaults used while reporting packet
@ -101,17 +101,17 @@ class neutron::agents::ml2::sriov (
$package_ensure = 'present',
$enabled = true,
$manage_service = true,
$physical_device_mappings = $::os_service_default,
$rpc_response_max_timeout = $::os_service_default,
$physical_device_mappings = $facts['os_service_default'],
$rpc_response_max_timeout = $facts['os_service_default'],
$polling_interval = 2,
$report_interval = $::os_service_default,
$exclude_devices = $::os_service_default,
$extensions = $::os_service_default,
$report_interval = $facts['os_service_default'],
$exclude_devices = $facts['os_service_default'],
$extensions = $facts['os_service_default'],
$purge_config = false,
$number_of_vfs = $::os_service_default,
$number_of_vfs = $facts['os_service_default'],
$resource_provider_bandwidths = [],
$resource_provider_hypervisors = [],
$resource_provider_default_hypervisor = $::os_service_default,
$resource_provider_default_hypervisor = $facts['os_service_default'],
$resource_provider_inventory_defaults = {},
) {
@ -123,8 +123,8 @@ class neutron::agents::ml2::sriov (
}
neutron_sriov_agent_config {
'sriov_nic/exclude_devices': value => pick(join(any2array($exclude_devices), ','), $::os_service_default);
'sriov_nic/physical_device_mappings': value => pick(join(any2array($physical_device_mappings), ','), $::os_service_default);
'sriov_nic/exclude_devices': value => pick(join(any2array($exclude_devices), ','), $facts['os_service_default']);
'sriov_nic/physical_device_mappings': value => pick(join(any2array($physical_device_mappings), ','), $facts['os_service_default']);
'agent/extensions': value => join(any2array($extensions), ',');
'DEFAULT/rpc_response_max_timeout': value => $rpc_response_max_timeout;
'agent/polling_interval': value => $polling_interval;
@ -162,17 +162,17 @@ class neutron::agents::ml2::sriov (
if ($resource_provider_bandwidths != []) {
$resource_provider_bandwidths_real = join(any2array($resource_provider_bandwidths), ',')
} else {
$resource_provider_bandwidths_real = $::os_service_default
$resource_provider_bandwidths_real = $facts['os_service_default']
}
if ($resource_provider_hypervisors != []) {
$resource_provider_hypervisors_real = join(any2array($resource_provider_hypervisors), ',')
} else {
$resource_provider_hypervisors_real = $::os_service_default
$resource_provider_hypervisors_real = $facts['os_service_default']
}
if empty($resource_provider_inventory_defaults) {
$resource_provider_inventory_defaults_real = $::os_service_default
$resource_provider_inventory_defaults_real = $facts['os_service_default']
} else {
if ($resource_provider_inventory_defaults =~ Hash){
$resource_provider_inventory_defaults_real = join(join_keys_to_values($resource_provider_inventory_defaults, ':'), ',')

64
manifests/agents/ovn_metadata.pp
View File

@ -21,22 +21,22 @@
# Debug. Defaults to false.
#
# [*auth_ca_cert*]
# CA cert to check against with for ssl keystone. (Defaults to $::os_service_default)
# CA cert to check against with for ssl keystone. (Defaults to $facts['os_service_default'])
#
# [*nova_client_cert*]
# Client certificate for nova metadata api server. (Defaults to $::os_service_default)
# Client certificate for nova metadata api server. (Defaults to $facts['os_service_default'])
#
# [*nova_client_priv_key*]
# Private key of client certificate. (Defaults to $::os_service_default)
# Private key of client certificate. (Defaults to $facts['os_service_default'])
#
# [*metadata_host*]
# The hostname of the metadata service. Defaults to $::os_service_default.
# The hostname of the metadata service. Defaults to $facts['os_service_default'].
#
# [*metadata_port*]
# The TCP port of the metadata service. Defaults to $::os_service_default.
# The TCP port of the metadata service. Defaults to $facts['os_service_default'].
#
# [*metadata_protocol*]
# The protocol to use for requests to Nova metadata server. Defaults to $::os_service_default.
# The protocol to use for requests to Nova metadata server. Defaults to $facts['os_service_default'].
#
# [*metadata_workers*]
# (optional) Number of separate worker processes to spawn. Greater than 0
@ -46,11 +46,11 @@
#
# [*metadata_backlog*]
# (optional) Number of backlog requests to configure the metadata server socket with.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*metadata_insecure*]
# (optional) Allow to perform insecure SSL (https) requests to nova metadata.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*ovsdb_connection*]
# (optional) The URI used to connect to the local OVSDB server.
@ -63,34 +63,34 @@
#
# [*ovn_sb_connection*]
# (optional) The connection string for the OVN_Southbound OVSDB
# Defaults to '$::os_service_default'
# Defaults to '$facts['os_service_default']'
#
# [*ovn_sb_private_key*]
# (optional) TThe PEM file with private key for SSL connection to OVN-SB-DB
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*ovn_sb_certificate*]
# (optional) The PEM file with certificate that certifies the
# private key specified in ovn_sb_private_key
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*ovn_sb_ca_cert*]
# (optional) TThe PEM file with CA certificate that OVN should use to
# verify certificates presented to it by SSL peers
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*ovsdb_connection_timeout*]
# (optional) Timeout in seconds for the OVSDB connection transaction
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*ovsdb_retry_max_interval*]
# (optional) Max interval in seconds between each retry to get the OVN NB
# and SB IDLs.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*ovsdb_probe_interval*]
# (optional) The probe interval for the OVSDB session in milliseconds.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*root_helper*]
# (optional) Use "sudo neutron-rootwrap /etc/neutron/rootwrap.conf" to use the real
@ -100,7 +100,7 @@
#
# [*root_helper_daemon*]
# (optional) Root helper daemon application to use when possible.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*state_path*]
# (optional) Where to store state files. This directory must be writable
@ -118,26 +118,26 @@ class neutron::agents::ovn_metadata (
$enabled = true,
$manage_service = true,
$debug = false,
$auth_ca_cert = $::os_service_default,
$metadata_host = $::os_service_default,
$metadata_port = $::os_service_default,
$metadata_protocol = $::os_service_default,
$auth_ca_cert = $facts['os_service_default'],
$metadata_host = $facts['os_service_default'],
$metadata_port = $facts['os_service_default'],
$metadata_protocol = $facts['os_service_default'],
$metadata_workers = 2,
$metadata_backlog = $::os_service_default,
$metadata_insecure = $::os_service_default,
$nova_client_cert = $::os_service_default,
$nova_client_priv_key = $::os_service_default,
$metadata_backlog = $facts['os_service_default'],
$metadata_insecure = $facts['os_service_default'],
$nova_client_cert = $facts['os_service_default'],
$nova_client_priv_key = $facts['os_service_default'],
$ovsdb_connection = 'tcp:127.0.0.1:6640',
$ovs_manager = 'ptcp:6640:127.0.0.1',
$ovn_sb_connection = $::os_service_default,
$ovn_sb_private_key = $::os_service_default,
$ovn_sb_certificate = $::os_service_default,
$ovn_sb_ca_cert = $::os_service_default,
$ovsdb_connection_timeout = $::os_service_default,
$ovsdb_retry_max_interval = $::os_service_default,
$ovsdb_probe_interval = $::os_service_default,
$ovn_sb_connection = $facts['os_service_default'],
$ovn_sb_private_key = $facts['os_service_default'],
$ovn_sb_certificate = $facts['os_service_default'],
$ovn_sb_ca_cert = $facts['os_service_default'],
$ovsdb_connection_timeout = $facts['os_service_default'],
$ovsdb_retry_max_interval = $facts['os_service_default'],
$ovsdb_probe_interval = $facts['os_service_default'],
$root_helper = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf',
$root_helper_daemon = $::os_service_default,
$root_helper_daemon = $facts['os_service_default'],
$state_path = '/var/lib/neutron',
$purge_config = false,
) {

8
manifests/agents/vpnaas.pp
View File

@ -32,7 +32,7 @@
# Defaults to 'neutron.agent.linux.interface.OVSInterfaceDriver'.
#
# [*ipsec_status_check_interval*]
# (optional) Status check interval. Defaults to $::os_service_default.
# (optional) Status check interval. Defaults to $facts['os_service_default'].
#
# [*purge_config*]
# (optional) Whether to set only the specified config options
@ -43,7 +43,7 @@ class neutron::agents::vpnaas (
$package_ensure = present,
$vpn_device_driver = 'neutron.services.vpn.device_drivers.ipsec.OpenSwanDriver',
$interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver',
$ipsec_status_check_interval = $::os_service_default,
$ipsec_status_check_interval = $facts['os_service_default'],
$purge_config = false,
) {
@ -60,8 +60,8 @@ class neutron::agents::vpnaas (
}
}
/\.LibreSwan/: {
if($::osfamily != 'Redhat') {
fail("LibreSwan is not supported on osfamily ${::osfamily}")
if($facts['os']['family'] != 'Redhat') {
fail("LibreSwan is not supported on osfamily ${facts['os']['family']}")
} else {
Package['libreswan'] -> Package<| title == 'neutron-vpnaas-agent' |>
package { 'libreswan':

112
manifests/cache.pp
View File

@ -9,99 +9,99 @@
# the cache region. This should not need to be changed unless there
# is another dogpile.cache region with the same configuration name.
# (string value)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*expiration_time*]
# (Optional) Default TTL, in seconds, for any cached item in the
# dogpile.cache region. This applies to any cached method that
# doesn't have an explicit cache expiration time defined for it.
# (integer value)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*backend*]
# (Optional) Dogpile.cache backend module. It is recommended that
# Memcache with pooling (oslo_cache.memcache_pool) or Redis
# (dogpile.cache.redis) be used in production deployments. (string value)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*backend_argument*]
# (Optional) Arguments supplied to the backend module. Specify this option
# once per argument to be passed to the dogpile.cache backend.
# Example format: "<argname>:<value>". (list value)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*proxies*]
# (Optional) Proxy classes to import that will affect the way the
# dogpile.cache backend functions. See the dogpile.cache documentation on
# changing-backend-behavior. (list value)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*enabled*]
# (Optional) Global toggle for caching. (boolean value)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*debug_cache_backend*]
# (Optional) Extra debugging from the cache backend (cache keys,
# get/set/delete/etc calls). This is only really useful if you need
# to see the specific cache-backend get/set/delete calls with the keys/values.
# Typically this should be left set to false. (boolean value)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*memcache_servers*]
# (Optional) Memcache servers in the format of "host:port".
# (dogpile.cache.memcache and oslo_cache.memcache_pool backends only).
# (list value)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*memcache_dead_retry*]
# (Optional) Number of seconds memcached server is considered dead before
# it is tried again. (dogpile.cache.memcache and oslo_cache.memcache_pool
# backends only). (integer value)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*memcache_socket_timeout*]
# (Optional) Timeout in seconds for every call to a server.
# (dogpile.cache.memcache and oslo_cache.memcache_pool backends only).
# (floating point value)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*enable_socket_keepalive*]
# (Optional) Global toggle for the socket keepalive of dogpile's
# pymemcache backend
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*socket_keepalive_idle*]
# (Optional) The time (in seconds) the connection needs to remain idle
# before TCP starts sending keepalive probes. Should be a positive integer
# most greater than zero.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*socket_keepalive_interval*]
# (Optional) The time (in seconds) between individual keepalive probes.
# Should be a positive integer most greater than zero.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*socket_keepalive_count*]
# (Optional) The maximum number of keepalive probes TCP should send before
# dropping the connection. Should be a positive integer most greater than
# zero.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*memcache_pool_maxsize*]
# (Optional) Max total number of open connections to every memcached server.
# (oslo_cache.memcache_pool backend only). (integer value)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*memcache_pool_unused_timeout*]
# (Optional) Number of seconds a connection to memcached is held unused
# in the pool before it is closed. (oslo_cache.memcache_pool backend only)
# (integer value)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*memcache_pool_connection_get_timeout*]
# (Optional) Number of seconds that an operation will wait to get a memcache
# client connection. (integer value)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*manage_backend_package*]
# (Optional) Whether to install the backend package for the cache.
@ -110,13 +110,13 @@
# [*tls_enabled*]
# (Optional) Global toggle for TLS usage when communicating with
# the caching servers.
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# [*tls_cafile*]
# (Optional) Path to a file of concatenated CA certificates in PEM
# format necessary to establish the caching server's authenticity.
# If tls_enabled is False, this option is ignored.
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# [*tls_certfile*]
# (Optional) Path to a single file in PEM format containing the
@ -124,83 +124,83 @@
# needed to establish the certificate's authenticity. This file
# is only required when client side authentication is necessary.
# If tls_enabled is False, this option is ignored.
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# [*tls_keyfile*]
# (Optional) Path to a single file containing the client's private
# key in. Otherwise the private key will be taken from the file
# specified in tls_certfile. If tls_enabled is False, this option
# is ignored.
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# [*tls_allowed_ciphers*]
# (Optional) Set the available ciphers for sockets created with
# the TLS context. It should be a string in the OpenSSL cipher
# list format. If not specified, all OpenSSL enabled ciphers will
# be available.
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# [*enable_retry_client*]
# (Optional) Enable retry client mechanisms to handle failure.
# Those mechanisms can be used to wrap all kind of pymemcache
# clients. The wrapper allows you to define how many attempts
# to make and how long to wait between attempts.
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# [*retry_attempts*]
# (Optional) Number of times to attempt an action before failing.
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# [*retry_delay*]
# (Optional) Number of seconds to sleep between each attempt.
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# [*hashclient_retry_attempts*]
# (Optional) Amount of times a client should be tried
# before it is marked dead and removed from the pool in
# the HashClient's internal mechanisms.
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# [*hashclient_retry_delay*]
# (Optional) Time in seconds that should pass between
# retry attempts in the HashClient's internal mechanisms.
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# [*dead_timeout*]
# (Optional) Time in seconds before attempting to add a node
# back in the pool in the HashClient's internal mechanisms.
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
class neutron::cache (
$config_prefix = $::os_service_default,
$expiration_time = $::os_service_default,
$backend = $::os_service_default,
$backend_argument = $::os_service_default,
$proxies = $::os_service_default,
$enabled = $::os_service_default,
$debug_cache_backend = $::os_service_default,
$memcache_servers = $::os_service_default,
$memcache_dead_retry = $::os_service_default,
$memcache_socket_timeout = $::os_service_default,
$memcache_pool_maxsize = $::os_service_default,
$memcache_pool_unused_timeout = $::os_service_default,
$memcache_pool_connection_get_timeout = $::os_service_default,
$enable_socket_keepalive = $::os_service_default,
$socket_keepalive_idle = $::os_service_default,
$socket_keepalive_interval = $::os_service_default,
$socket_keepalive_count = $::os_service_default,
$config_prefix = $facts['os_service_default'],
$expiration_time = $facts['os_service_default'],
$backend = $facts['os_service_default'],
$backend_argument = $facts['os_service_default'],
$proxies = $facts['os_service_default'],
$enabled = $facts['os_service_default'],
$debug_cache_backend = $facts['os_service_default'],
$memcache_servers = $facts['os_service_default'],
$memcache_dead_retry = $facts['os_service_default'],
$memcache_socket_timeout = $facts['os_service_default'],
$memcache_pool_maxsize = $facts['os_service_default'],
$memcache_pool_unused_timeout = $facts['os_service_default'],
$memcache_pool_connection_get_timeout = $facts['os_service_default'],
$enable_socket_keepalive = $facts['os_service_default'],
$socket_keepalive_idle = $facts['os_service_default'],
$socket_keepalive_interval = $facts['os_service_default'],
$socket_keepalive_count = $facts['os_service_default'],
$manage_backend_package = true,
$tls_enabled = $::os_service_default,
$tls_cafile = $::os_service_default,
$tls_certfile = $::os_service_default,
$tls_keyfile = $::os_service_default,
$tls_allowed_ciphers = $::os_service_default,
$enable_retry_client = $::os_service_default,
$retry_attempts = $::os_service_default,
$retry_delay = $::os_service_default,
$hashclient_retry_attempts = $::os_service_default,
$hashclient_retry_delay = $::os_service_default,
$dead_timeout = $::os_service_default,
$tls_enabled = $facts['os_service_default'],
$tls_cafile = $facts['os_service_default'],
$tls_certfile = $facts['os_service_default'],
$tls_keyfile = $facts['os_service_default'],
$tls_allowed_ciphers = $facts['os_service_default'],
$enable_retry_client = $facts['os_service_default'],
$retry_attempts = $facts['os_service_default'],
$retry_delay = $facts['os_service_default'],
$hashclient_retry_attempts = $facts['os_service_default'],
$hashclient_retry_delay = $facts['os_service_default'],
$dead_timeout = $facts['os_service_default'],
) {
include neutron::deps

24
manifests/cors.pp
View File

@ -8,41 +8,41 @@
# (Optional) Indicate whether this resource may be shared with the domain
# received in the requests "origin" header.
# (string value)
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*allow_credentials*]
# (Optional) Indicate that the actual request can include user credentials.
# (boolean value)
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*expose_headers*]
# (Optional) Indicate which headers are safe to expose to the API.
# (list value)
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*max_age*]
# (Optional) Maximum cache age of CORS preflight requests.
# (integer value)
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*allow_methods*]
# (Optional) Indicate which methods can be used during the actual request.
# (list value)
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*allow_headers*]
# (Optional) Indicate which header field names may be used during the actual
# request.
# (list value)
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
class neutron::cors (
$allowed_origin = $::os_service_default,
$allow_credentials = $::os_service_default,
$expose_headers = $::os_service_default,
$max_age = $::os_service_default,
$allow_methods = $::os_service_default,
$allow_headers = $::os_service_default,
$allowed_origin = $facts['os_service_default'],
$allow_credentials = $facts['os_service_default'],
$expose_headers = $facts['os_service_default'],
$max_age = $facts['os_service_default'],
$allow_methods = $facts['os_service_default'],
$allow_headers = $facts['os_service_default'],
) {
include neutron::deps

32
manifests/db.pp
View File

@ -10,49 +10,49 @@
#
# [*database_connection_recycle_time*]
# Timeout when db connections should be reaped.
# (Optional) Defaults to $::os_service_default.
# (Optional) Defaults to $facts['os_service_default'].
#
# [*database_max_pool_size*]
# Maximum number of SQL connections to keep open in a pool.
# (Optional) Defaults to $::os_service_default.
# (Optional) Defaults to $facts['os_service_default'].
#
# [*database_max_retries*]
# Maximum db connection retries during startup.
# Setting -1 implies an infinite retry count.
# (Optional) Defaults to $::os_service_default.
# (Optional) Defaults to $facts['os_service_default'].
#
# [*database_retry_interval*]
# Interval between retries of opening a sql connection.
# (Optional) Defaults to $::os_service_default.
# (Optional) Defaults to $facts['os_service_default'].
#
# [*database_max_overflow*]
# If set, use this value for max_overflow with sqlalchemy.
# (Optional) Defaults to $::os_service_default.
# (Optional) Defaults to $facts['os_service_default'].
#
# [*database_pool_timeout*]
# (Optional) If set, use this value for pool_timeout with SQLAlchemy.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*mysql_enable_ndb*]
# (Optional) If True, transparently enables support for handling MySQL
# Cluster (NDB).
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*database_db_max_retries*]
# (Optional) Maximum retries in case of connection error or deadlock error
# before error is raised. Set to -1 to specify an infinite retry count.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
class neutron::db (
$database_connection = 'sqlite:////var/lib/neutron/ovs.sqlite',
$database_connection_recycle_time = $::os_service_default,
$database_max_pool_size = $::os_service_default,
$database_max_retries = $::os_service_default,
$database_retry_interval = $::os_service_default,
$database_max_overflow = $::os_service_default,
$database_pool_timeout = $::os_service_default,
$mysql_enable_ndb = $::os_service_default,
$database_db_max_retries = $::os_service_default,
$database_connection_recycle_time = $facts['os_service_default'],
$database_max_pool_size = $facts['os_service_default'],
$database_max_retries = $facts['os_service_default'],
$database_retry_interval = $facts['os_service_default'],
$database_max_overflow = $facts['os_service_default'],
$database_pool_timeout = $facts['os_service_default'],
$mysql_enable_ndb = $facts['os_service_default'],
$database_db_max_retries = $facts['os_service_default'],
) {
include neutron::deps

32
manifests/designate.pp
View File

@ -33,7 +33,7 @@
#
# [*system_scope*]
# (optional) Scope for system operations
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*auth_url*]
# (optional) Authorization URI for connection to designate in admin context.
@ -44,27 +44,27 @@
# [*cafile*]
# (optional) A PEM encoded Certificate Authority to use when verifying HTTPs
# connections.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*certfile*]
# (optional) Required if identity server requires client certificate
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*allow_reverse_dns_lookup*]
# (optional) Enable or not the creation of reverse lookup (PTR) records.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*ipv4_ptr_zone_prefix_size*]
# (optional) Enable or not the creation of reverse lookup (PTR) records.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*ipv6_ptr_zone_prefix_size*]
# (optional) Enable or not the creation of reverse lookup (PTR) records.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*ptr_zone_email*]
# (optional) The email address to be used when creating PTR zones.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
class neutron::designate (
$password,
@ -74,14 +74,14 @@ class neutron::designate (
$user_domain_name = 'Default',
$project_name = 'services',
$project_domain_name = 'Default',
$system_scope = $::os_service_default,
$system_scope = $facts['os_service_default'],
$auth_url = 'http://127.0.0.1:5000',
$cafile = $::os_service_default,
$certfile = $::os_service_default,
$allow_reverse_dns_lookup = $::os_service_default,
$ipv4_ptr_zone_prefix_size = $::os_service_default,
$ipv6_ptr_zone_prefix_size = $::os_service_default,
$ptr_zone_email = $::os_service_default,
$cafile = $facts['os_service_default'],
$certfile = $facts['os_service_default'],
$allow_reverse_dns_lookup = $facts['os_service_default'],
$ipv4_ptr_zone_prefix_size = $facts['os_service_default'],
$ipv6_ptr_zone_prefix_size = $facts['os_service_default'],
$ptr_zone_email = $facts['os_service_default'],
) {
include neutron::deps
include neutron::params
@ -90,8 +90,8 @@ class neutron::designate (
$project_name_real = $project_name
$project_domain_name_real = $project_domain_name
} else {
$project_name_real = $::os_service_default
$project_domain_name_real = $::os_service_default
$project_name_real = $facts['os_service_default']
$project_domain_name_real = $facts['os_service_default']
}
neutron_config {

16
manifests/healthcheck.pp
View File

@ -6,28 +6,28 @@
#
# [*detailed*]
# (Optional) Show more detailed information as part of the response.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*backends*]
# (Optional) Additional backends that can perform health checks and report
# that information back as part of a request.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*disable_by_file_path*]
# (Optional) Check the presence of a file to determine if an application
# is running on a port.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*disable_by_file_paths*]
# (Optional) Check the presence of a file to determine if an application
# is running on a port. Expects a "port:path" list of strings.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
class neutron::healthcheck (
$detailed = $::os_service_default,
$backends = $::os_service_default,
$disable_by_file_path = $::os_service_default,
$disable_by_file_paths = $::os_service_default,
$detailed = $facts['os_service_default'],
$backends = $facts['os_service_default'],
$disable_by_file_path = $facts['os_service_default'],
$disable_by_file_paths = $facts['os_service_default'],
) {
include neutron::deps

232
manifests/init.pp
View File

@ -15,11 +15,11 @@
#
# [*bind_host*]
# (optional) The IP/interface to bind to
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*bind_port*]
# (optional) The port to use
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*core_plugin*]
# (optional) Neutron plugin provider
@ -29,7 +29,7 @@
# (optional) Advanced service modules.
# Could be an array that can have these elements:
# router, firewall, vpnaas, metering, qos
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*auth_strategy*]
# (optional) How to authenticate
@ -37,41 +37,41 @@
#
# [*base_mac*]
# (optional) The MAC address pattern to use.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*dhcp_lease_duration*]
# (optional) DHCP lease
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*host*]
# (optional) Hostname to be used by the server, agents and services.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*dns_domain*]
# (optional) Domain to use for building the hostnames
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*dhcp_agents_per_network*]
# (optional) Number of DHCP agents scheduled to host a network.
# This enables redundant DHCP agents for configured networks.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*global_physnet_mtu*]
# (optional) The MTU size for the interfaces managed by neutron
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*dhcp_agent_notification*]
# (optional) Allow sending resource operation notification to DHCP agent.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*allow_bulk*]
# (optional) Enable bulk crud operations
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*api_extensions_path*]
# (optional) Specify additional paths for API extensions that the
# module in use needs to load.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*root_helper*]
# (optional) Use "sudo neutron-rootwrap /etc/neutron/rootwrap.conf" to use the real
@ -81,36 +81,36 @@
#
# [*root_helper_daemon*]
# (optional) Root helper daemon application to use when possible.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*report_interval*]
# (optional) Seconds between nodes reporting state to server; should be less than
# agent_down_time, best if it is half or less than agent_down_time.
# agent_down_time is a config for neutron-server, set by class neutron::server
# report_interval is a config for neutron agents, set by class neutron
# Defaults to: $::os_service_default
# Defaults to: $facts['os_service_default']
#
# [*control_exchange*]
# (optional) What RPC queue/exchange to use
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*executor_thread_pool_size*]
# (optional) Size of executor thread pool when executor is threading or eventlet.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*default_transport_url*]
# (optional) A URL representing the messaging driver to use and its full
# configuration. Transport URLs take the form:
# transport://user:pass@host1:port[,hostN:portN]/virtual_host
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*rpc_response_timeout*]
# (optional) Seconds to wait for a response from a call
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*rabbit_ha_queues*]
# (Optional) Use HA queues in RabbitMQ.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*rabbit_heartbeat_timeout_threshold*]
# (optional) Number of seconds after which the RabbitMQ broker is considered
@ -118,14 +118,14 @@
# Heartbeating helps to ensure the TCP connection to RabbitMQ isn't silently
# closed, resulting in missed or lost messages from the queue.
# (Requires kombu >= 3.0.7 and amqp >= 1.4.0)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*rabbit_heartbeat_rate*]
# (optional) How often during the rabbit_heartbeat_timeout_threshold period to
# check the heartbeat on RabbitMQ connection. (i.e. rabbit_heartbeat_rate=2
# when rabbit_heartbeat_timeout_threshold=60, the heartbeat will be checked
# every 30 seconds.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*rabbit_heartbeat_in_pthread*]
# (Optional) EXPERIMENTAL: Run the health check heartbeat thread
@ -135,145 +135,145 @@
# example if the parent process have monkey patched the
# stdlib by using eventlet/greenlet then the heartbeat
# will be run through a green thread.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*rabbit_use_ssl*]
# (optional) Connect over SSL for RabbitMQ
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*rabbit_transient_queues_ttl*]
# (optional) Positive integer representing duration in seconds for queue
# TTL (x-expires). Queues which are unused for the duration of the TTL are
# automatically deleted. The parameter affects only reply and fanout queues.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*amqp_durable_queues*]
# (optional) Define queues as "durable" to rabbitmq.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*kombu_ssl_ca_certs*]
# (optional) SSL certification authority file (valid only if SSL enabled).
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*kombu_ssl_certfile*]
# (optional) SSL cert file (valid only if SSL enabled).
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*kombu_ssl_keyfile*]
# (optional) SSL key file (valid only if SSL enabled).
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*kombu_ssl_version*]
# (optional) SSL version to use (valid only if SSL enabled).
# Valid values are TLSv1, SSLv23 and SSLv3. SSLv2 may be
# available on some distributions.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*kombu_reconnect_delay*]
# (optional) The amount of time to wait before attempting to reconnect
# to MQ provider. This is used in some cases where you may need to wait
# for the provider to properly promote the master before attempting to
# reconnect. See https://review.opendev.org/#/c/76686
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*kombu_missing_consumer_retry_timeout*]
# (Optional) How long to wait a missing client before abandoning to send it
# its replies. This value should not be longer than rpc_response_timeout.
# (integer value)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*kombu_failover_strategy*]
# (Optional) Determines how the next RabbitMQ node is chosen in case the one
# we are currently connected to becomes unavailable. Takes effect only if
# more than one RabbitMQ node is provided in config. (string value)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*kombu_compression*]
# (optional) Possible values are: gzip, bz2. If not set compression will not
# be used. This option may not be available in future versions. EXPERIMENTAL.
# (string value)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*amqp_server_request_prefix*]
# (Optional) Address prefix used when sending to a specific server
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*amqp_broadcast_prefix*]
# (Optional) address prefix used when broadcasting to all servers
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*amqp_group_request_prefix*]
# (Optional) address prefix when sending to any server in group
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*amqp_container_name*]
# (Optional) Name for the AMQP container
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*amqp_idle_timeout*]
# (Optional) Timeout for inactive connections
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*amqp_trace*]
# (Optional) Debug: dump AMQP frames to stdout
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*amqp_ssl_ca_file*]
# (Optional) CA certificate PEM file to verify server certificate
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*amqp_ssl_cert_file*]
# (Optional) Identifying certificate PEM file to present to clients
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*amqp_ssl_key_file*]
# (Optional) Private key PEM file used to sign cert_file certificate
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*amqp_ssl_key_password*]
# (Optional) Password for decrypting ssl_key_file (if encrypted)
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*amqp_sasl_mechanisms*]
# (Optional) Space separated list of acceptable SASL mechanisms
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*amqp_sasl_config_dir*]
# (Optional) Path to directory that contains the SASL configuration
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*amqp_sasl_config_name*]
# (Optional) Name of configuration file (without .conf suffix)
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*amqp_username*]
# (Optional) User name for message broker authentication
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*amqp_password*]
# (Optional) Password for message broker authentication
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*use_ssl*]
# (optional) Enable SSL on the API server
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*cert_file*]
# (optional) certificate file to use when starting api server securely
# defaults to $::os_service_default
# defaults to $facts['os_service_default']
#
# [*key_file*]
# (optional) Private key file to use when starting API server securely
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*ca_file*]
# (optional) CA certificate file to use to verify connecting clients
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*state_path*]
# (optional) Where to store state files. This directory must be writable
# by the user executing the agent
# Defaults to: $::os_service_default
# Defaults to: $facts['os_service_default']
#
# [*lock_path*]
# (optional) Where to store lock files. This directory must be writeable
@ -288,93 +288,93 @@
# [*notification_driver*]
# (optional) Driver or drivers to handle sending notifications.
# Value can be a string or a list.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*notification_topics*]
# (optional) AMQP topic used for OpenStack notifications
# Defaults to ::os_service_default
# Defaults to facts['os_service_default']
#
# [*notification_transport_url*]
# (optional) A URL representing the messaging driver to use for
# notifications and its full configuration. Transport URLs
# take the form:
# transport://user:pass@host1:port[,hostN:portN]/virtual_host
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*max_allowed_address_pair*]
# (optional) Maximum number of allowed address pairs per port
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*vlan_transparent*]
# (optional) Allow plugins that support it to create VLAN transparent networks
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
class neutron (
$enabled = true,
$package_ensure = 'present',
$bind_host = $::os_service_default,
$bind_port = $::os_service_default,
$bind_host = $facts['os_service_default'],
$bind_port = $facts['os_service_default'],
$core_plugin = 'ml2',
$service_plugins = $::os_service_default,
$service_plugins = $facts['os_service_default'],
$auth_strategy = 'keystone',
$base_mac = $::os_service_default,
$dhcp_lease_duration = $::os_service_default,
$host = $::os_service_default,
$dns_domain = $::os_service_default,
$dhcp_agents_per_network = $::os_service_default,
$global_physnet_mtu = $::os_service_default,
$dhcp_agent_notification = $::os_service_default,
$allow_bulk = $::os_service_default,
$api_extensions_path = $::os_service_default,
$base_mac = $facts['os_service_default'],
$dhcp_lease_duration = $facts['os_service_default'],
$host = $facts['os_service_default'],
$dns_domain = $facts['os_service_default'],
$dhcp_agents_per_network = $facts['os_service_default'],
$global_physnet_mtu = $facts['os_service_default'],
$dhcp_agent_notification = $facts['os_service_default'],
$allow_bulk = $facts['os_service_default'],
$api_extensions_path = $facts['os_service_default'],
$root_helper = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf',
$root_helper_daemon = $::os_service_default,
$report_interval = $::os_service_default,
$control_exchange = $::os_service_default,
$executor_thread_pool_size = $::os_service_default,
$default_transport_url = $::os_service_default,
$rpc_response_timeout = $::os_service_default,
$rabbit_ha_queues = $::os_service_default,
$rabbit_heartbeat_timeout_threshold = $::os_service_default,
$rabbit_heartbeat_rate = $::os_service_default,
$rabbit_heartbeat_in_pthread = $::os_service_default,
$rabbit_use_ssl = $::os_service_default,
$rabbit_transient_queues_ttl = $::os_service_default,
$amqp_durable_queues = $::os_service_default,
$kombu_ssl_ca_certs = $::os_service_default,
$kombu_ssl_certfile = $::os_service_default,
$kombu_ssl_keyfile = $::os_service_default,
$kombu_ssl_version = $::os_service_default,
$kombu_reconnect_delay = $::os_service_default,
$kombu_missing_consumer_retry_timeout = $::os_service_default,
$kombu_failover_strategy = $::os_service_default,
$kombu_compression = $::os_service_default,
$amqp_server_request_prefix = $::os_service_default,
$amqp_broadcast_prefix = $::os_service_default,
$amqp_group_request_prefix = $::os_service_default,
$amqp_container_name = $::os_service_default,
$amqp_idle_timeout = $::os_service_default,
$amqp_trace = $::os_service_default,
$amqp_ssl_ca_file = $::os_service_default,
$amqp_ssl_cert_file = $::os_service_default,
$amqp_ssl_key_file = $::os_service_default,
$amqp_ssl_key_password = $::os_service_default,
$amqp_sasl_mechanisms = $::os_service_default,
$amqp_sasl_config_dir = $::os_service_default,
$amqp_sasl_config_name = $::os_service_default,
$amqp_username = $::os_service_default,
$amqp_password = $::os_service_default,
$use_ssl = $::os_service_default,
$cert_file = $::os_service_default,
$key_file = $::os_service_default,
$ca_file = $::os_service_default,
$state_path = $::os_service_default,
$root_helper_daemon = $facts['os_service_default'],
$report_interval = $facts['os_service_default'],
$control_exchange = $facts['os_service_default'],
$executor_thread_pool_size = $facts['os_service_default'],
$default_transport_url = $facts['os_service_default'],
$rpc_response_timeout = $facts['os_service_default'],
$rabbit_ha_queues = $facts['os_service_default'],
$rabbit_heartbeat_timeout_threshold = $facts['os_service_default'],
$rabbit_heartbeat_rate = $facts['os_service_default'],
$rabbit_heartbeat_in_pthread = $facts['os_service_default'],
$rabbit_use_ssl = $facts['os_service_default'],
$rabbit_transient_queues_ttl = $facts['os_service_default'],
$amqp_durable_queues = $facts['os_service_default'],
$kombu_ssl_ca_certs = $facts['os_service_default'],
$kombu_ssl_certfile = $facts['os_service_default'],
$kombu_ssl_keyfile = $facts['os_service_default'],
$kombu_ssl_version = $facts['os_service_default'],
$kombu_reconnect_delay = $facts['os_service_default'],
$kombu_missing_consumer_retry_timeout = $facts['os_service_default'],
$kombu_failover_strategy = $facts['os_service_default'],
$kombu_compression = $facts['os_service_default'],
$amqp_server_request_prefix = $facts['os_service_default'],
$amqp_broadcast_prefix = $facts['os_service_default'],
$amqp_group_request_prefix = $facts['os_service_default'],
$amqp_container_name = $facts['os_service_default'],
$amqp_idle_timeout = $facts['os_service_default'],
$amqp_trace = $facts['os_service_default'],
$amqp_ssl_ca_file = $facts['os_service_default'],
$amqp_ssl_cert_file = $facts['os_service_default'],
$amqp_ssl_key_file = $facts['os_service_default'],
$amqp_ssl_key_password = $facts['os_service_default'],
$amqp_sasl_mechanisms = $facts['os_service_default'],
$amqp_sasl_config_dir = $facts['os_service_default'],
$amqp_sasl_config_name = $facts['os_service_default'],
$amqp_username = $facts['os_service_default'],
$amqp_password = $facts['os_service_default'],
$use_ssl = $facts['os_service_default'],
$cert_file = $facts['os_service_default'],
$key_file = $facts['os_service_default'],
$ca_file = $facts['os_service_default'],
$state_path = $facts['os_service_default'],
$lock_path = '$state_path/lock',
$purge_config = false,
$notification_driver = $::os_service_default,
$notification_topics = $::os_service_default,
$notification_transport_url = $::os_service_default,
$max_allowed_address_pair = $::os_service_default,
$vlan_transparent = $::os_service_default,
$notification_driver = $facts['os_service_default'],
$notification_topics = $facts['os_service_default'],
$notification_transport_url = $facts['os_service_default'],
$max_allowed_address_pair = $facts['os_service_default'],
$vlan_transparent = $facts['os_service_default'],
) {
include neutron::deps

118
manifests/keystone/authtoken.pp
View File

@ -10,7 +10,7 @@
#
# [*password*]
# (Optional) Password to create for the service user
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*auth_url*]
# (Optional) The URL to use for authentication.
@ -30,21 +30,21 @@
#
# [*system_scope*]
# (Optional) Scope for system operations.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*insecure*]
# (Optional) If true, explicitly allow TLS without checking server cert
# against any certificate authorities. WARNING: not recommended. Use with
# caution.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*auth_section*]
# (Optional) Config Section from which to load plugin specific options
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*auth_type*]
# (Optional) Authentication type to load
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*www_authenticate_uri*]
# (Optional) Complete public Identity API endpoint.
@ -52,26 +52,26 @@
#
# [*auth_version*]
# (Optional) API version of the admin Identity API endpoint.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*cache*]
# (Optional) Env key for the swift cache.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*cafile*]
# (Optional) A PEM encoded Certificate Authority to use when verifying HTTPs
# connections.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*certfile*]
# (Optional) Required if identity server requires client certificate
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*delay_auth_decision*]
# (Optional) Do not handle authorization requests within the middleware, but
# delegate the authorization decision to downstream WSGI components. Boolean
# value
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*enforce_token_bind*]
# (Optional) Used to control the use and type of token binding. Can be set
@ -81,57 +81,57 @@
# type is unknown the token will be rejected. "required" any form of token
# binding is needed to be allowed. Finally the name of a binding method that
# must be present in tokens. String value.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*http_connect_timeout*]
# (Optional) Request timeout value for communicating with Identity API
# server.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*http_request_max_retries*]
# (Optional) How many times are we trying to reconnect when communicating
# with Identity API Server. Integer value
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*include_service_catalog*]
# (Optional) Indicate whether to set the X-Service-Catalog header. If False,
# middleware will not ask for service catalog on token validation and will
# not set the X-Service-Catalog header. Boolean value.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*keyfile*]
# (Optional) Required if identity server requires client certificate
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*memcache_pool_conn_get_timeout*]
# (Optional) Number of seconds that an operation will wait to get a memcached
# client connection from the pool. Integer value
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*memcache_pool_dead_retry*]
# (Optional) Number of seconds memcached server is considered dead before it
# is tried again. Integer value
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*memcache_pool_maxsize*]
# (Optional) Maximum total number of open connections to every memcached
# server. Integer value
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*memcache_pool_socket_timeout*]
# (Optional) Number of seconds a connection to memcached is held unused in
# the pool before it is closed. Integer value
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*memcache_pool_unused_timeout*]
# (Optional) Number of seconds a connection to memcached is held unused in
# the pool before it is closed. Integer value
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*memcache_secret_key*]
# (Optional, mandatory if memcache_security_strategy is defined) This string
# is used for key derivation.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*memcache_security_strategy*]
# (Optional) If defined, indicate whether token data should be authenticated
@ -139,17 +139,17 @@
# HMAC) in the cache. If ENCRYPT, token data is encrypted and authenticated in the
# cache. If the value is not one of these options or empty, auth_token will
# raise an exception on initialization.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*memcache_use_advanced_pool*]
# (Optional) Use the advanced (eventlet safe) memcached client pool. The
# advanced pool will only work under python 2.x Boolean value
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*memcached_servers*]
# (Optional) Optionally specify a list of memcached server(s) to use for
# caching. If left undefined, tokens will instead be cached in-process.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*manage_memcache_package*]
# (Optional) Whether to install the python-memcache package.
@ -157,13 +157,13 @@
#
# [*region_name*]
# (Optional) The region in which the identity server can be found.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*token_cache_time*]
# (Optional) In order to prevent excessive effort spent validating tokens,
# the middleware caches previously-seen tokens for a configurable duration
# (in seconds). Set to -1 to disable caching completely. Integer value
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*service_token_roles*]
# (Optional) A choice of roles that must be present in a service token.
@ -173,23 +173,23 @@
# here are applied as an ANY check so any role in this list
# must be present. For backwards compatibility reasons this
# currently only affects the allow_expired check. (list value)
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*service_token_roles_required*]
# (optional) backwards compatibility to ensure that the service tokens are
# compared against a list of possible roles for validity
# true/false
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*service_type*]
# (Optional) The name or type of the service as it appears in the service
# catalog. This is used to validate tokens that have restricted access rules.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*interface*]
# (Optional) Interface to use for the Identity API endpoint. Valid values are
# "public", "internal" or "admin".
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*params*]
# (Optional) Hash of additional parameters to pass through to the keystone
@ -197,42 +197,42 @@
#
class neutron::keystone::authtoken(
$username = 'neutron',
$password = $::os_service_default,
$password = $facts['os_service_default'],
$auth_url = 'http://localhost:5000',
$project_name = 'services',
$user_domain_name = 'Default',
$project_domain_name = 'Default',
$system_scope = $::os_service_default,
$insecure = $::os_service_default,
$auth_section = $::os_service_default,
$system_scope = $facts['os_service_default'],
$insecure = $facts['os_service_default'],
$auth_section = $facts['os_service_default'],
$auth_type = 'password',
$www_authenticate_uri = 'http://localhost:5000',
$auth_version = $::os_service_default,
$cache = $::os_service_default,
$cafile = $::os_service_default,
$certfile = $::os_service_default,
$delay_auth_decision = $::os_service_default,
$enforce_token_bind = $::os_service_default,
$http_connect_timeout = $::os_service_default,
$http_request_max_retries = $::os_service_default,
$include_service_catalog = $::os_service_default,
$keyfile = $::os_service_default,
$memcache_pool_conn_get_timeout = $::os_service_default,
$memcache_pool_dead_retry = $::os_service_default,
$memcache_pool_maxsize = $::os_service_default,
$memcache_pool_socket_timeout = $::os_service_default,
$memcache_pool_unused_timeout = $::os_service_default,
$memcache_secret_key = $::os_service_default,
$memcache_security_strategy = $::os_service_default,
$memcache_use_advanced_pool = $::os_service_default,
$memcached_servers = $::os_service_default,
$auth_version = $facts['os_service_default'],
$cache = $facts['os_service_default'],
$cafile = $facts['os_service_default'],
$certfile = $facts['os_service_default'],
$delay_auth_decision = $facts['os_service_default'],
$enforce_token_bind = $facts['os_service_default'],
$http_connect_timeout = $facts['os_service_default'],
$http_request_max_retries = $facts['os_service_default'],
$include_service_catalog = $facts['os_service_default'],
$keyfile = $facts['os_service_default'],
$memcache_pool_conn_get_timeout = $facts['os_service_default'],
$memcache_pool_dead_retry = $facts['os_service_default'],
$memcache_pool_maxsize = $facts['os_service_default'],
$memcache_pool_socket_timeout = $facts['os_service_default'],
$memcache_pool_unused_timeout = $facts['os_service_default'],
$memcache_secret_key = $facts['os_service_default'],
$memcache_security_strategy = $facts['os_service_default'],
$memcache_use_advanced_pool = $facts['os_service_default'],
$memcached_servers = $facts['os_service_default'],
$manage_memcache_package = false,
$region_name = $::os_service_default,
$token_cache_time = $::os_service_default,
$service_token_roles = $::os_service_default,
$service_token_roles_required = $::os_service_default,
$service_type = $::os_service_default,
$interface = $::os_service_default,
$region_name = $facts['os_service_default'],
$token_cache_time = $facts['os_service_default'],
$service_token_roles = $facts['os_service_default'],
$service_token_roles_required = $facts['os_service_default'],
$service_type = $facts['os_service_default'],
$interface = $facts['os_service_default'],
$params = {},
) {

82
manifests/logging.pp
View File

@ -6,82 +6,82 @@
#
# [*debug*]
# (Optional) Print debug messages in the logs
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*use_syslog*]
# (Optional) Use syslog for logging
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*use_json*]
# (Optional) Use json for logging
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*use_journal*]
# (Optional) Use journal for logging
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*use_stderr*]
# (Optional) Use stderr for logging
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*log_file*]
# (Optional) Where to log
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*log_dir*]
# (Optional) Directory where logs should be stored
# If set to $::os_service_default, it will not log to any directory
# If set to $facts['os_service_default'], it will not log to any directory
# Defaults to /var/log/neutron
#
# [*log_config_append*]
# (Optional) The name of an additional logging configuration file.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
# See https://docs.python.org/2/howto/logging.html
#
# [*log_date_format*]
# (Optional) Format string for %%(asctime)s in log records.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
# Example: 'Y-%m-%d %H:%M:%S'
#
# [*watch_log_file*]
# (Optional) Uses logging handler designed to watch file system (boolean value).
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*syslog_log_facility*]
# (Optional) Syslog facility to receive log lines.
# This option is ignored if log_config_append is set.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*logging_context_format_string*]
# (Optional) Format string to use for log messages with context.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
# Example: '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s \
# [%(request_id)s %(user_identity)s] %(instance)s%(message)s'
#
# [*logging_default_format_string*]
# (Optional) Format string to use for log messages when context is undefined.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
# Example: '%(asctime)s.%(msecs)03d %(process)d %(levelname)s \
# %(name)s [-] %(instance)s%(message)s'
#
# [*logging_debug_format_suffix*]
# (Optional) Additional data to append to log message when logging level for the message is DEBUG'
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
# Example: '%(funcName)s %(pathname)s:%(lineno)d'
#
# [*logging_exception_prefix*]
# (Optional) Prefix each line of exception output with this format.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
# Example: '%(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s'
#
# [*logging_user_identity_format*]
# (Optional) Defines the format string for %(user_identity)s that is used in logging_context_format_string.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
# Example: '%(user)s %(tenant)s %(domain)s %(user_domain)s %(project_domain)s'
#
# [*default_log_levels*]
# (Optional) Hash of logger (keys) and level (values) pairs.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
# Example:
# { 'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN',
# 'sqlalchemy' => 'WARN', 'suds' => 'INFO', 'iso8601' => 'WARN',
@ -89,44 +89,44 @@
#
# [*publish_errors*]
# (Optional) Enables or disables publication of error events (boolean value).
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*instance_format*]
# (Optional) The format for an instance that is passed with the log message.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
# Example: '[instance: %(uuid)s] '
#
# [*instance_uuid_format*]
# (Optional) The format for an instance UUID that is passed with the log message.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
# Example: '[instance: %(uuid)s] '
#
# [*fatal_deprecations*]
# (Optional) Enables or disables fatal status of deprecations (boolean value).
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
class neutron::logging (
$debug = $::os_service_default,
$use_syslog = $::os_service_default,
$use_json = $::os_service_default,
$use_journal = $::os_service_default,
$use_stderr = $::os_service_default,
$log_file = $::os_service_default,
$debug = $facts['os_service_default'],
$use_syslog = $facts['os_service_default'],
$use_json = $facts['os_service_default'],
$use_journal = $facts['os_service_default'],
$use_stderr = $facts['os_service_default'],
$log_file = $facts['os_service_default'],
$log_dir = '/var/log/neutron',
$log_config_append = $::os_service_default,
$log_date_format = $::os_service_default,
$watch_log_file = $::os_service_default,
$syslog_log_facility = $::os_service_default,
$logging_context_format_string = $::os_service_default,
$logging_default_format_string = $::os_service_default,
$logging_debug_format_suffix = $::os_service_default,
$logging_exception_prefix = $::os_service_default,
$logging_user_identity_format = $::os_service_default,
$default_log_levels = $::os_service_default,
$publish_errors = $::os_service_default,
$instance_format = $::os_service_default,
$instance_uuid_format = $::os_service_default,
$fatal_deprecations = $::os_service_default,
$log_config_append = $facts['os_service_default'],
$log_date_format = $facts['os_service_default'],
$watch_log_file = $facts['os_service_default'],
$syslog_log_facility = $facts['os_service_default'],
$logging_context_format_string = $facts['os_service_default'],
$logging_default_format_string = $facts['os_service_default'],
$logging_debug_format_suffix = $facts['os_service_default'],
$logging_exception_prefix = $facts['os_service_default'],
$logging_user_identity_format = $facts['os_service_default'],
$default_log_levels = $facts['os_service_default'],
$publish_errors = $facts['os_service_default'],
$instance_format = $facts['os_service_default'],
$instance_uuid_format = $facts['os_service_default'],
$fatal_deprecations = $facts['os_service_default'],
) {
include neutron::deps

176
manifests/params.pp
View File

@ -29,92 +29,96 @@ class neutron::params {
$group = 'neutron'
$arista_plugin_package = 'python3-networking-arista'
if($::osfamily == 'Redhat') {
$package_name = 'openstack-neutron'
$server_service = 'neutron-server'
$server_package = false
$api_package_name = false
$api_service_name = false
$rpc_package_name = false
$rpc_service_name = false
$ml2_server_package = 'openstack-neutron-ml2'
$ovs_agent_package = 'openstack-neutron-openvswitch'
$ovs_cleanup_service = 'neutron-ovs-cleanup'
$linuxbridge_agent_package = 'openstack-neutron-linuxbridge'
$sriov_nic_agent_service = 'neutron-sriov-nic-agent'
$sriov_nic_agent_package = 'openstack-neutron-sriov-nic-agent'
$macvtap_agent_package = 'openstack-neutron-macvtap-agent'
$dhcp_agent_package = false
$metering_agent_package = 'openstack-neutron-metering-agent'
$vpnaas_agent_package = 'openstack-neutron-vpnaas'
$l2gw_agent_package = 'openstack-neutron-l2gw-agent'
$l2gw_package = 'python3-networking-l2gw'
$ovn_metadata_agent_package = 'openstack-neutron-ovn-metadata-agent'
$dynamic_routing_package = false
$bgp_dragent_package = 'openstack-neutron-bgp-dragent'
$openswan_package = 'libreswan'
$libreswan_package = 'libreswan'
$metadata_agent_package = false
$l3_agent_package = false
$neutron_wsgi_script_path = '/var/www/cgi-bin/neutron'
$neutron_wsgi_script_source = '/usr/bin/neutron-api'
$networking_baremetal_package = 'python3-networking-baremetal'
$networking_baremetal_agent_package = 'python3-ironic-neutron-agent'
$networking_baremetal_agent_service = 'ironic-neutron-agent'
$mlnx_agent_package = 'python3-networking-mlnx'
$mlnx_plugin_package = 'python3-networking-mlnx'
$eswitchd_package = false
$mlnx_agent_service = 'neutron-mlnx-agent'
$eswitchd_service = 'eswitchd'
} elsif($::osfamily == 'Debian') {
$package_name = 'neutron-common'
if $::operatingsystem == 'Debian' {
$ml2_server_package = false
$server_service = false
$server_package = false
$api_package_name = 'neutron-api'
$api_service_name = 'neutron-api'
$rpc_package_name = 'neutron-rpc-server'
$rpc_service_name = 'neutron-rpc-server'
$dynamic_routing_package = 'python3-neutron-dynamic-routing'
} else {
$ml2_server_package = 'neutron-plugin-ml2'
$server_service = 'neutron-server'
$server_package = 'neutron-server'
$api_package_name = false
$api_service_name = false
$rpc_package_name = false
$rpc_service_name = false
$dynamic_routing_package = 'python3-neutron-dynamic-routing'
case $facts['os']['family'] {
'RedHat': {
$package_name = 'openstack-neutron'
$server_service = 'neutron-server'
$server_package = false
$api_package_name = false
$api_service_name = false
$rpc_package_name = false
$rpc_service_name = false
$ml2_server_package = 'openstack-neutron-ml2'
$ovs_agent_package = 'openstack-neutron-openvswitch'
$ovs_cleanup_service = 'neutron-ovs-cleanup'
$linuxbridge_agent_package = 'openstack-neutron-linuxbridge'
$sriov_nic_agent_service = 'neutron-sriov-nic-agent'
$sriov_nic_agent_package = 'openstack-neutron-sriov-nic-agent'
$macvtap_agent_package = 'openstack-neutron-macvtap-agent'
$dhcp_agent_package = false
$metering_agent_package = 'openstack-neutron-metering-agent'
$vpnaas_agent_package = 'openstack-neutron-vpnaas'
$l2gw_agent_package = 'openstack-neutron-l2gw-agent'
$l2gw_package = 'python3-networking-l2gw'
$ovn_metadata_agent_package = 'openstack-neutron-ovn-metadata-agent'
$dynamic_routing_package = false
$bgp_dragent_package = 'openstack-neutron-bgp-dragent'
$openswan_package = 'libreswan'
$libreswan_package = 'libreswan'
$metadata_agent_package = false
$l3_agent_package = false
$neutron_wsgi_script_path = '/var/www/cgi-bin/neutron'
$neutron_wsgi_script_source = '/usr/bin/neutron-api'
$networking_baremetal_package = 'python3-networking-baremetal'
$networking_baremetal_agent_package = 'python3-ironic-neutron-agent'
$networking_baremetal_agent_service = 'ironic-neutron-agent'
$mlnx_agent_package = 'python3-networking-mlnx'
$mlnx_plugin_package = 'python3-networking-mlnx'
$eswitchd_package = false
$mlnx_agent_service = 'neutron-mlnx-agent'
$eswitchd_service = 'eswitchd'
}
'Debian': {
$package_name = 'neutron-common'
if $facts['os']['name'] == 'Debian' {
$ml2_server_package = false
$server_service = false
$server_package = false
$api_package_name = 'neutron-api'
$api_service_name = 'neutron-api'
$rpc_package_name = 'neutron-rpc-server'
$rpc_service_name = 'neutron-rpc-server'
$dynamic_routing_package = 'python3-neutron-dynamic-routing'
} else {
$ml2_server_package = 'neutron-plugin-ml2'
$server_service = 'neutron-server'
$server_package = 'neutron-server'
$api_package_name = false
$api_service_name = false
$rpc_package_name = false
$rpc_service_name = false
$dynamic_routing_package = 'python3-neutron-dynamic-routing'
}
$bgp_dragent_package = 'neutron-bgp-dragent'
$ovs_agent_package = 'neutron-openvswitch-agent'
$ovs_cleanup_service = false
$linuxbridge_agent_package = 'neutron-linuxbridge-agent'
$sriov_nic_agent_service = 'neutron-sriov-agent'
$sriov_nic_agent_package = 'neutron-sriov-agent'
$macvtap_agent_package = 'neutron-macvtap-agent'
$dhcp_agent_package = 'neutron-dhcp-agent'
$metering_agent_package = 'neutron-metering-agent'
$vpnaas_agent_package = 'python3-neutron-vpnaas'
$openswan_package = 'strongswan'
$libreswan_package = false
$metadata_agent_package = 'neutron-metadata-agent'
$l3_agent_package = 'neutron-l3-agent'
$l2gw_agent_package = 'neutron-l2gateway-agent'
$l2gw_package = 'python3-networking-l2gw'
$ovn_metadata_agent_package = 'neutron-ovn-metadata-agent'
$neutron_wsgi_script_path = '/usr/lib/cgi-bin/neutron'
$neutron_wsgi_script_source = '/usr/bin/neutron-api'
$networking_baremetal_package = 'python3-ironic-neutron-agent'
$networking_baremetal_agent_package = 'ironic-neutron-agent'
$networking_baremetal_agent_service = 'ironic-neutron-agent'
$mlnx_agent_package = 'neutron-mlnx-agent'
$mlnx_plugin_package = 'python3-networking-mlnx'
$eswitchd_package = 'networking-mlnx-eswitchd'
$mlnx_agent_service = 'neutron-mlnx-agent'
$eswitchd_service = 'networking-mlnx-eswitchd'
}
default: {
fail("Unsupported osfamily: ${facts['os']['family']}")
}
$bgp_dragent_package = 'neutron-bgp-dragent'
$ovs_agent_package = 'neutron-openvswitch-agent'
$ovs_cleanup_service = false
$linuxbridge_agent_package = 'neutron-linuxbridge-agent'
$sriov_nic_agent_service = 'neutron-sriov-agent'
$sriov_nic_agent_package = 'neutron-sriov-agent'
$macvtap_agent_package = 'neutron-macvtap-agent'
$dhcp_agent_package = 'neutron-dhcp-agent'
$metering_agent_package = 'neutron-metering-agent'
$vpnaas_agent_package = 'python3-neutron-vpnaas'
$openswan_package = 'strongswan'
$libreswan_package = false
$metadata_agent_package = 'neutron-metadata-agent'
$l3_agent_package = 'neutron-l3-agent'
$l2gw_agent_package = 'neutron-l2gateway-agent'
$l2gw_package = 'python3-networking-l2gw'
$ovn_metadata_agent_package = 'neutron-ovn-metadata-agent'
$neutron_wsgi_script_path = '/usr/lib/cgi-bin/neutron'
$neutron_wsgi_script_source = '/usr/bin/neutron-api'
$networking_baremetal_package = 'python3-ironic-neutron-agent'
$networking_baremetal_agent_package = 'ironic-neutron-agent'
$networking_baremetal_agent_service = 'ironic-neutron-agent'
$mlnx_agent_package = 'neutron-mlnx-agent'
$mlnx_plugin_package = 'python3-networking-mlnx'
$eswitchd_package = 'networking-mlnx-eswitchd'
$mlnx_agent_service = 'neutron-mlnx-agent'
$eswitchd_service = 'networking-mlnx-eswitchd'
} else {
fail("Unsupported osfamily ${::osfamily}")
}
}

24
manifests/plugins/ml2.pp
View File

@ -32,7 +32,7 @@
# [*extension_drivers*]
# (optional) Ordered list of extension driver entrypoints to be loaded
# from the neutron.ml2.extension_drivers namespace.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*tenant_network_types*]
# (optional) Ordered list of network_types to allocate as tenant networks.
@ -91,7 +91,7 @@
# [*enable_security_group*]
# (optional) Controls if neutron security group is enabled or not.
# It should be false when you use nova security group.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*package_ensure*]
# (optional) Ensure state for package.
@ -100,7 +100,7 @@
# [*physical_network_mtus*]
# (optional) For L2 mechanism drivers, per-physical network MTU setting.
# Should be an array with 'physnetX1:9000'.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*path_mtu*]
# (optional) For L3 mechanism drivers, determines the maximum permissible
@ -116,16 +116,16 @@
# [*max_header_size*]
# (optional) Geneve encapsulation header size is dynamic, this value is used to calculate
# the maximum MTU for the driver.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*overlay_ip_version*]
# (optional) Configures the IP version used for all overlay network endpoints. Valid values
# are 4 and 6.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
class neutron::plugins::ml2 (
$type_drivers = ['local', 'flat', 'vlan', 'gre', 'vxlan', 'geneve'],
$extension_drivers = $::os_service_default,
$extension_drivers = $facts['os_service_default'],
$tenant_network_types = ['local', 'flat', 'vlan', 'gre', 'vxlan'],
$mechanism_drivers = ['openvswitch'],
$flat_networks = '*',
@ -133,13 +133,13 @@ class neutron::plugins::ml2 (
$tunnel_id_ranges = '20:100',
$vxlan_group = '224.0.0.1',
$vni_ranges = '10:100',
$enable_security_group = $::os_service_default,
$enable_security_group = $facts['os_service_default'],
$package_ensure = 'present',
$physical_network_mtus = $::os_service_default,
$physical_network_mtus = $facts['os_service_default'],
$path_mtu = 0,
$purge_config = false,
$max_header_size = $::os_service_default,
$overlay_ip_version = $::os_service_default,
$max_header_size = $facts['os_service_default'],
$overlay_ip_version = $facts['os_service_default'],
) {
include neutron::deps
@ -155,7 +155,7 @@ class neutron::plugins::ml2 (
}
# lint:endignore
if $::osfamily == 'Debian' {
if $facts['os']['family'] == 'Debian' {
file {'/etc/default/neutron-server':
ensure => present,
owner => 'root',
@ -164,7 +164,7 @@ class neutron::plugins::ml2 (
tag => 'neutron-config-file',
}
}
if $::operatingsystem == 'Ubuntu' {
if $facts['os']['name'] == 'Ubuntu' {
file_line { '/etc/default/neutron-server:NEUTRON_PLUGIN_CONFIG':
path => '/etc/default/neutron-server',
match => '^NEUTRON_PLUGIN_CONFIG=(.*)$',

16
manifests/plugins/ml2/arista.pp
View File

@ -32,19 +32,19 @@
# (optional) Region name that is assigned to the OpenStack controller.
# This setting must be set if multiple regions are using the same Arista
# hardware.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*sync_interval*]
# (optional) Sync interval in seconds between neutron plugin and EOS.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*use_fqdn*]
# (optional) Defines if hostnames are sent to Arista EOS as FQDNS
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*conn_timeout*]
# (optional) Connection timeout interval in seconds.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*package_ensure*]
# (optional) The intended state of the python-networking-baremetal
@ -56,10 +56,10 @@ class neutron::plugins::ml2::arista(
$eapi_host,
$eapi_username,
$eapi_password,
$region_name = $::os_service_default,
$sync_interval = $::os_service_default,
$conn_timeout = $::os_service_default,
$use_fqdn = $::os_service_default,
$region_name = $facts['os_service_default'],
$sync_interval = $facts['os_service_default'],
$conn_timeout = $facts['os_service_default'],
$use_fqdn = $facts['os_service_default'],
$package_ensure = 'present'
) {

20
manifests/plugins/ml2/arista/l3.pp
View File

@ -31,34 +31,34 @@
# [*secondary_l3_host*]
# (optional) The Arist EOS IP address for second switch MLAGed
# with the first one. Only required if $mlag_config is set to true.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*mlag_config*]
# (optional) Indicates that the switch is in MLAG mode.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*l3_sync_interval*]
# (optional) Sync interval in seconds between l3 service plugin and
# the EOS.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*conn_timeout*]
# (optional) Connection timeout interval in seconds.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*use_vrf*]
# (optional) If it should create a router in VRF.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
class neutron::plugins::ml2::arista::l3(
$primary_l3_host,
$primary_l3_host_username,
$primary_l3_host_password,
$secondary_l3_host = $::os_service_default,
$mlag_config = $::os_service_default,
$l3_sync_interval = $::os_service_default,
$conn_timeout = $::os_service_default,
$use_vrf = $::os_service_default,
$secondary_l3_host = $facts['os_service_default'],
$mlag_config = $facts['os_service_default'],
$l3_sync_interval = $facts['os_service_default'],
$conn_timeout = $facts['os_service_default'],
$use_vrf = $facts['os_service_default'],
) {
include neutron::deps

8
manifests/plugins/ml2/bagpipe.pp
View File

@ -23,19 +23,19 @@
#
# [*bagpipe_bgp_port*]
# BGP component API port
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*mpls_bridge*]
# OVS bridge to use
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*package_ensure*]
# (optional) The state of the package
# Defaults to present
#
class neutron::plugins::ml2::bagpipe (
$bagpipe_bgp_port = $::os_service_default,
$mpls_bridge = $::os_service_default,
$bagpipe_bgp_port = $facts['os_service_default'],
$mpls_bridge = $facts['os_service_default'],
$package_ensure = 'present',
) {

28
manifests/plugins/ml2/cisco/vts.pp
View File

@ -8,33 +8,33 @@
# [*vts_username*]
# (optional) The VTS controller username
# Example: 'admin'
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*vts_password*]
# (optional) The VTS controller password
# Example: 'admin'
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*vts_url*]
# (optional) The VTS controller neutron URL
# Example: 'http://127.0.0.1:8888/api/running/openstack'
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*vts_timeout*]
# (optional) Timeout for connection to vts host REST interface.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*vts_sync_timeout*]
# (optional) Timeout for synchronization to VTS.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*vts_retry_count*]
# (optional) Number of retries for synchronization with VTS.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*vts_vmmid*]
# (optional) Virtual Machine Manager ID as assigned by VTS
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*package_ensure*]
# (optional) The intended state of the cisco-vts-ml2-driver
@ -43,13 +43,13 @@
# Defaults to 'present'
#
class neutron::plugins::ml2::cisco::vts (
$vts_username = $::os_service_default,
$vts_password = $::os_service_default,
$vts_url = $::os_service_default,
$vts_vmmid = $::os_service_default,
$vts_timeout = $::os_service_default,
$vts_sync_timeout = $::os_service_default,
$vts_retry_count = $::os_service_default,
$vts_username = $facts['os_service_default'],
$vts_password = $facts['os_service_default'],
$vts_url = $facts['os_service_default'],
$vts_vmmid = $facts['os_service_default'],
$vts_timeout = $facts['os_service_default'],
$vts_sync_timeout = $facts['os_service_default'],
$vts_retry_count = $facts['os_service_default'],
$package_ensure = 'present'
) {

12
manifests/plugins/ml2/mellanox/mlnx_sdn_assist.pp
View File

@ -6,17 +6,17 @@
#
# [*sdn_token*]
# (optional) The Mellanox controller token
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
# Example: 'abcdef'
#
# [*sdn_url*]
# (optional) The Mellanox controller neutron URL
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
# Example: 'http://127.0.0.1/ufmRestV3/'
#
# [*sdn_domain*]
# (optional) The Mellanox controller domain
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
# Example: 'cloudx'
#
# [*sync_enabled*]
@ -37,9 +37,9 @@
# Defaults to []
#
class neutron::plugins::ml2::mellanox::mlnx_sdn_assist (
$sdn_token = $::os_service_default,
$sdn_url = $::os_service_default,
$sdn_domain = $::os_service_default,
$sdn_token = $facts['os_service_default'],
$sdn_url = $facts['os_service_default'],
$sdn_domain = $facts['os_service_default'],
$sync_enabled = true,
$bind_normal_ports = false,
$bind_normal_ports_physnets = [],

30
manifests/plugins/ml2/nuage.pp
View File

@ -65,20 +65,24 @@ class neutron::plugins::ml2::nuage (
tag => 'neutron-config-file',
}
if $::osfamily == 'Debian' {
file_line { 'neutron-server-DAEMON_ARGS':
path => '/etc/default/neutron-server',
line => 'DAEMON_ARGS="$DAEMON_ARGS --config-file /etc/neutron/plugins/nuage/plugin.ini"',
tag => 'neutron-file-line'
case $facts['os']['family'] {
'Debian': {
file_line { 'neutron-server-DAEMON_ARGS':
path => '/etc/default/neutron-server',
line => 'DAEMON_ARGS="$DAEMON_ARGS --config-file /etc/neutron/plugins/nuage/plugin.ini"',
tag => 'neutron-file-line'
}
}
}
if $::osfamily == 'Redhat' {
file { '/etc/neutron/conf.d/neutron-server/nuage_plugin.conf':
ensure => link,
require => File['/etc/neutron/plugins/nuage/plugin.ini'],
target => $::neutron::params::nuage_config_file,
tag => 'neutron-config-file',
'Redhat': {
file { '/etc/neutron/conf.d/neutron-server/nuage_plugin.conf':
ensure => link,
require => File['/etc/neutron/plugins/nuage/plugin.ini'],
target => $::neutron::params::nuage_config_file,
tag => 'neutron-config-file',
}
}
default : {
fail("Unsupported osfamily: ${facts['os']['family']}")
}
}

24
manifests/plugins/ml2/opendaylight.pp
View File

@ -12,39 +12,39 @@
#
# [*odl_username*]
# (optional) The opendaylight controller username
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
# Example: 'admin'
#
# [*odl_password*]
# (optional) The opendaylight controller password
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
# Example: 'admin'
#
# [*odl_url*]
# (optional) The opendaylight controller neutron URL
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
# Example: 'http://127.0.0.1:8080/controller/nb/v2/neutron'
#
# [*port_binding_controller*]
# (optional) Name of the controller to be used for port binding.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*odl_hostconf_uri*]
# (optional) Path for ODL host configuration REST interface.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*odl_features*]
# (optional) List of ODL features to enable
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
class neutron::plugins::ml2::opendaylight (
$package_ensure = 'present',
$odl_username = $::os_service_default,
$odl_password = $::os_service_default,
$odl_url = $::os_service_default,
$port_binding_controller = $::os_service_default,
$odl_hostconf_uri = $::os_service_default,
$odl_features = $::os_service_default,
$odl_username = $facts['os_service_default'],
$odl_password = $facts['os_service_default'],
$odl_url = $facts['os_service_default'],
$port_binding_controller = $facts['os_service_default'],
$odl_hostconf_uri = $facts['os_service_default'],
$odl_features = $facts['os_service_default'],
) {
include neutron::deps

82
manifests/plugins/ml2/ovn.pp
View File

@ -12,31 +12,31 @@
#
# [*ovn_nb_private_key*]
# (optional) The PEM file with private key for SSL connection to OVN-NB-DB
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*ovn_nb_certificate*]
# (optional) The PEM file with certificate that certifies the private
# key specified in ovn_nb_private_key
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*ovn_nb_ca_cert*]
# (optional) The PEM file with CA certificate that OVN should use to
# verify certificates presented to it by SSL peers
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*ovn_sb_private_key*]
# (optional) The PEM file with private key for SSL connection to OVN-SB-DB
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*ovn_sb_certificate*]
# (optional) The PEM file with certificate that certifies the
# private key specified in ovn_sb_private_key
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*ovn_sb_ca_cert*]
# (optional) The PEM file with CA certificate that OVN should use to
# verify certificates presented to it by SSL peers
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*package_ensure*]
# (optional) The intended state of the python-networking-odl
@ -46,16 +46,16 @@
#
# [*ovsdb_connection_timeout*]
# (optional) Timeout in seconds for the OVSDB connection transaction
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*ovsdb_retry_max_interval*]
# (optional) Max interval in seconds between each retry to get the OVN NB
# and SB IDLs.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*ovsdb_probe_interval*]
# (optional) The probe interval for the OVSDB session in milliseconds.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*neutron_sync_mode*]
# (optional) The synchronization mode of OVN with Neutron DB.
@ -67,33 +67,33 @@
# repair - during neutron-server startup, automatically create resources
# found in Neutron but not in OVN. Also remove resources from OVN
# that are no longer in Neutron.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*ovn_metadata_enabled*]
# (optional) Whether to enable metadata service in OVN.
# Type: boolean
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*dvr_enabled*]
# (optional) Whether to enable DVR.
# Type: boolean
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*disable_ovn_dhcp_for_baremetal_ports*]
# (optional) Whether to disable built-in DHCP for baremetal ports.
# Type: boolean
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*dns_servers*]
# (optional) List of dns servers which will be as forwarders
# if a subnet's dns_nameservers is empty.
# Type: List
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*vhostuser_socket_dir*]
# (optional) The vhost-user socket directory for OVS
# Type: String
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*ovn_emit_need_to_frag*]
# (optional) Configure OVN to emit "need to frag" packets in case
@ -103,54 +103,54 @@
# ovs-appctl -t ovs-vswitchd dpif/show-dp-features br-int |
# grep "Check pkt length action".
# Type: boolean
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*network_log_rate_limit*]
# (Optional) Maximum packets logging per second.
# Used by logging service plugin.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
# Minimum possible value is 100.
#
# [*network_log_burst_limit*]
# (Optional) Maximum number of packets per rate_limit.
# Used by logging service plugin.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
# Minimum possible value is 25.
#
# [*network_log_local_output_log_base*]
# (Optional) Output logfile path on agent side, default syslog file.
# Used by logging service plugin.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
class neutron::plugins::ml2::ovn(
$ovn_nb_connection = $::os_service_default,
$ovn_sb_connection = $::os_service_default,
$ovn_nb_private_key = $::os_service_default,
$ovn_nb_certificate = $::os_service_default,
$ovn_nb_ca_cert = $::os_service_default,
$ovn_sb_private_key = $::os_service_default,
$ovn_sb_certificate = $::os_service_default,
$ovn_sb_ca_cert = $::os_service_default,
$ovn_nb_connection = $facts['os_service_default'],
$ovn_sb_connection = $facts['os_service_default'],
$ovn_nb_private_key = $facts['os_service_default'],
$ovn_nb_certificate = $facts['os_service_default'],
$ovn_nb_ca_cert = $facts['os_service_default'],
$ovn_sb_private_key = $facts['os_service_default'],
$ovn_sb_certificate = $facts['os_service_default'],
$ovn_sb_ca_cert = $facts['os_service_default'],
$package_ensure = 'present',
$ovsdb_connection_timeout = $::os_service_default,
$ovsdb_retry_max_interval = $::os_service_default,
$ovsdb_probe_interval = $::os_service_default,
$neutron_sync_mode = $::os_service_default,
$ovn_metadata_enabled = $::os_service_default,
$dvr_enabled = $::os_service_default,
$disable_ovn_dhcp_for_baremetal_ports = $::os_service_default,
$dns_servers = $::os_service_default,
$vhostuser_socket_dir = $::os_service_default,
$ovn_emit_need_to_frag = $::os_service_default,
$network_log_rate_limit = $::os_service_default,
$network_log_burst_limit = $::os_service_default,
$network_log_local_output_log_base = $::os_service_default,
$ovsdb_connection_timeout = $facts['os_service_default'],
$ovsdb_retry_max_interval = $facts['os_service_default'],
$ovsdb_probe_interval = $facts['os_service_default'],
$neutron_sync_mode = $facts['os_service_default'],
$ovn_metadata_enabled = $facts['os_service_default'],
$dvr_enabled = $facts['os_service_default'],
$disable_ovn_dhcp_for_baremetal_ports = $facts['os_service_default'],
$dns_servers = $facts['os_service_default'],
$vhostuser_socket_dir = $facts['os_service_default'],
$ovn_emit_need_to_frag = $facts['os_service_default'],
$network_log_rate_limit = $facts['os_service_default'],
$network_log_burst_limit = $facts['os_service_default'],
$network_log_local_output_log_base = $facts['os_service_default'],
) {
include neutron::deps
require neutron::plugins::ml2
if ! ( $neutron_sync_mode in ['off', 'log', 'repair', $::os_service_default] ) {
if ! ( $neutron_sync_mode in ['off', 'log', 'repair', $facts['os_service_default']] ) {
fail( 'Invalid value for neutron_sync_mode parameter' )
}

2
manifests/plugins/ml2/ovs_driver.pp
View File

@ -29,7 +29,7 @@ class neutron::plugins::ml2::ovs_driver (
}
} else {
neutron_plugin_ml2 {
'ovs_driver/vnic_type_prohibit_list': value => $::os_service_default;
'ovs_driver/vnic_type_prohibit_list': value => $facts['os_service_default'];
}
}
}

2
manifests/plugins/ml2/sriov_driver.pp
View File

@ -29,7 +29,7 @@ class neutron::plugins::ml2::sriov_driver (
}
} else {
neutron_plugin_ml2 {
'sriov_driver/vnic_type_prohibit_list': value => $::os_service_default;
'sriov_driver/vnic_type_prohibit_list': value => $facts['os_service_default'];
}
}
}

24
manifests/plugins/opencontrail.pp
View File

@ -4,15 +4,15 @@
#
# [*api_server_ip*]
# (Optional) IP address of the API Server
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*api_server_port*]
# (Optional) Port of the API Server.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*contrail_extensions*]
# (Optional) Array of OpenContrail extensions to be supported
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
# Example:
#
# class {'neutron::plugins::opencontrail' :
@ -21,11 +21,11 @@
#
# [*timeout*]
# (Optional) VNC API Server request timeout in seconds.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*connection_timeout*]
# (Optional) VNC API Server connection timeout in seconds.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*package_ensure*]
# (Optional) Ensure state for package.
@ -37,11 +37,11 @@
# Defaults to false.
#
class neutron::plugins::opencontrail (
$api_server_ip = $::os_service_default,
$api_server_port = $::os_service_default,
$contrail_extensions = $::os_service_default,
$timeout = $::os_service_default,
$connection_timeout = $::os_service_default,
$api_server_ip = $facts['os_service_default'],
$api_server_port = $facts['os_service_default'],
$contrail_extensions = $facts['os_service_default'],
$timeout = $facts['os_service_default'],
$connection_timeout = $facts['os_service_default'],
$package_ensure = 'present',
$purge_config = false,
) {
@ -64,7 +64,7 @@ class neutron::plugins::opencontrail (
mode => '0640'}
)
if $::osfamily == 'Debian' {
if $facts['os']['family'] == 'Debian' {
file_line { '/etc/default/neutron-server:NEUTRON_PLUGIN_CONFIG':
path => '/etc/default/neutron-server',
match => '^NEUTRON_PLUGIN_CONFIG=(.*)$',
@ -73,7 +73,7 @@ class neutron::plugins::opencontrail (
}
}
if $::osfamily == 'Redhat' {
if $facts['os']['family'] == 'Redhat' {
file { '/etc/neutron/plugin.ini':
ensure => link,
target => $::neutron::params::opencontrail_config_file,

6
manifests/plugins/ovs/opendaylight.pp
View File

@ -150,7 +150,7 @@ class neutron::plugins::ovs::opendaylight (
$rest_data = @("END":json/L)
{\
"aaa-cert-rpc:input": {\
"aaa-cert-rpc:node-alias": "${::hostname}",\
"aaa-cert-rpc:node-alias": "${facts['networking']['hostname']}",\
"aaa-cert-rpc:node-cert": "${cert_data}"\
}\
}
@ -161,7 +161,7 @@ class neutron::plugins::ovs::opendaylight (
$rest_get_data = @("END":json/L)
{\
"aaa-cert-rpc:input": {\
"aaa-cert-rpc:node-alias": "${::hostname}"\
"aaa-cert-rpc:node-alias": "${facts['networking']['hostname']}"\
}\
}
|-END
@ -252,7 +252,7 @@ class neutron::plugins::ovs::opendaylight (
"vnic_type": "normal",\
"vif_type": "vhostuser",\
"vif_details": {\
"uuid": "${::ovs_uuid}",\
"uuid": "${facts['ovs_uuid']}",\
"has_datapath_type_netdev": true,\
"port_prefix": "vhu",\
"vhostuser_socket_dir": "${vhostuser_socket_dir}",\

16
manifests/policy.pp
View File

@ -6,12 +6,12 @@
#
# [*enforce_scope*]
# (Optional) Whether or not to enforce scope when evaluating policies.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*enforce_new_defaults*]
# (Optional) Whether or not to use old deprecated defaults when evaluating
# policies.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*policies*]
# (Optional) Set of policies to configure for neutron
@ -34,11 +34,11 @@
#
# [*policy_default_rule*]
# (Optional) Default rule. Enforced when a requested rule is not found.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*policy_dirs*]
# (Optional) Path to the neutron policy folder
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*purge_config*]
# (optional) Whether to set only the specified policy rules in the policy
@ -46,12 +46,12 @@
# Defaults to false.
#
class neutron::policy (
$enforce_scope = $::os_service_default,
$enforce_new_defaults = $::os_service_default,
$enforce_scope = $facts['os_service_default'],
$enforce_new_defaults = $facts['os_service_default'],
$policies = {},
$policy_path = '/etc/neutron/policy.yaml',
$policy_default_rule = $::os_service_default,
$policy_dirs = $::os_service_default,
$policy_default_rule = $facts['os_service_default'],
$policy_dirs = $facts['os_service_default'],
$purge_config = false,
) {

40
manifests/quota.pp
View File

@ -6,61 +6,61 @@
#
# [*default_quota*]
# (optional) Default number of resources allowed per tenant,
# minus for unlimited. Defaults to $::os_service_default.
# minus for unlimited. Defaults to $facts['os_service_default'].
#
# [*quota_network*]
# (optional) Number of networks allowed per tenant, and minus means unlimited.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*quota_subnet*]
# (optional) Number of subnets allowed per tenant, and minus means unlimited.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*quota_port*]
# (optional) Number of ports allowed per tenant, and minus means unlimited.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*quota_router*]
# (optional) Number of routers allowed per tenant, and minus means unlimited.
# Requires L3 extension. Defaults to $::os_service_default.
# Requires L3 extension. Defaults to $facts['os_service_default'].
#
# [*quota_floatingip*]
# (optional) Number of floating IPs allowed per tenant,
# and minus means unlimited. Requires L3 extension. Defaults to $::os_service_default.
# and minus means unlimited. Requires L3 extension. Defaults to $facts['os_service_default'].
#
# [*quota_security_group*]
# (optional) Number of security groups allowed per tenant,
# and minus means unlimited. Requires securitygroup extension.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*quota_security_group_rule*]
# (optional) Number of security rules allowed per tenant,
# and minus means unlimited. Requires securitygroup extension.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*quota_driver*]
# (optional) Default driver to use for quota checks.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*quota_rbac_policy*]
# (optional) Number of rbac policies allowed per tenant.
# A negative value means unlimited.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
class neutron::quota (
$default_quota = $::os_service_default,
$quota_network = $::os_service_default,
$quota_subnet = $::os_service_default,
$quota_port = $::os_service_default,
$default_quota = $facts['os_service_default'],
$quota_network = $facts['os_service_default'],
$quota_subnet = $facts['os_service_default'],
$quota_port = $facts['os_service_default'],
# l3 extension
$quota_router = $::os_service_default,
$quota_floatingip = $::os_service_default,
$quota_router = $facts['os_service_default'],
$quota_floatingip = $facts['os_service_default'],
# securitygroup extension
$quota_security_group = $::os_service_default,
$quota_security_group_rule = $::os_service_default,
$quota_driver = $::os_service_default,
$quota_security_group = $facts['os_service_default'],
$quota_security_group_rule = $facts['os_service_default'],
$quota_driver = $facts['os_service_default'],
# rbac extension
$quota_rbac_policy = $::os_service_default,
$quota_rbac_policy = $facts['os_service_default'],
) {
include neutron::deps

20
manifests/quota/sfc.pp
View File

@ -6,30 +6,30 @@
#
# [*quota_port_chain*]
# (Optional) Maximum number of port chain per tenant.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*quota_port_pair_group*]
# (Optional) Maximum number of port pair group per tenant.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*quota_port_pair*]
# (Optional) Maximum number of port pair per tenant.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*quota_service_graphs*]
# (Optional) Maximum number of Service Graphs per tenant.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*quota_flow_classifier*]
# (Optional) Maximum number of Flow Classifiers per tenant.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
class neutron::quota::sfc (
$quota_port_chain = $::os_service_default,
$quota_port_pair_group = $::os_service_default,
$quota_port_pair = $::os_service_default,
$quota_service_graphs = $::os_service_default,
$quota_flow_classifier = $::os_service_default
$quota_port_chain = $facts['os_service_default'],
$quota_port_pair_group = $facts['os_service_default'],
$quota_port_pair = $facts['os_service_default'],
$quota_service_graphs = $facts['os_service_default'],
$quota_flow_classifier = $facts['os_service_default']
) {
include neutron::deps

88
manifests/server.pp
View File

@ -63,39 +63,39 @@
# (Optional) Number of separate worker processes to spawn. Greater than 0
# launches that number of child processes as workers. The parent process
# manages them.
# Defaults to: $::os_workers
# Defaults to: $facts['os_workers']
#
# [*rpc_workers*]
# (Optional) Number of separate worker processes to spawn. Greater than 0
# launches that number of child processes as workers. The parent process
# manages them.
# Defaults to: $::os_workers
# Defaults to: $facts['os_workers']
#
# [*rpc_state_report_workers*]
# (Optional) Number of RPC worker process dedicated to state reports queue.
# Defaults to: $::os_service_default.
# Defaults to: $facts['os_service_default'].
#
# [*rpc_response_max_timeout*]
# (Optional) Maximum seconds to wait for a response from an RPC call
# Defaults to: $::os_service_default
# Defaults to: $facts['os_service_default']
#
# [*agent_down_time*]
# (Optional) Seconds to regard the agent as down; should be at least twice
# report_interval, to be sure the agent is down for good.
# agent_down_time is a config for neutron-server, set by class neutron::server
# report_interval is a config for neutron agents, set by class neutron
# Defaults to: $::os_service_default
# Defaults to: $facts['os_service_default']
#
# [*enable_new_agents*]
# (Optional) Agent starts with admin_state_up=False when enable_new_agents=False. In the
# case, user's resources will not be scheduled automatically to the agent until
# admin changes admin_state_up to True.
# Defaults to: $::os_service_default
# Defaults to: $facts['os_service_default']
#
# [*network_scheduler_driver*]
# (Optional) The scheduler used when scheduling networks
# neutron.scheduler.dhcp_agent_scheduler.AZAwareWeightScheduler to use availability zone hints scheduling.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# Example:
#
@ -114,16 +114,16 @@
# (Optional) Setting the "router_distributed" flag to "True" will default to the creation
# of distributed tenant routers.
# Also can be the type of the router on the create request (admin-only attribute).
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*enable_dvr*]
# (Optional) Setting the "enable_dvr" flag to "False" will disable "dvr" API extension exposure.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*dhcp_load_type*]
# (Optional) The resource type whose load is being reported by the agent.
# The expected values are either 'networks', 'subnets', 'ports'.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# Example:
#
@ -134,7 +134,7 @@
# [*default_availability_zones*]
# (Optional) A list of availability zones that are picked when availability zone is not specified
# The expected input is an array when specified.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# Example:
#
@ -145,12 +145,12 @@
# [*allow_automatic_l3agent_failover*]
# (Optional) Allow automatic rescheduling of routers from dead L3 agents with
# admin_state_up set to True to alive agents.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*allow_automatic_dhcp_failover*]
# (Optional) Allow automatic rescheduling of dhcp from dead dhcp agents with
# admin_state_up set to True to alive agents.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*l3_ha*]
# (Optional) Enable high availability for virtual routers.
@ -162,21 +162,21 @@
#
# [*l3_ha_net_cidr*]
# (Optional) CIDR of the administrative network if HA mode is enabled.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*l3_ha_network_type*]
# (Optional) The network type to use when creating the HA network for an HA
# router.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*l3_ha_network_physical_name*]
# (Optional) The physical network name with which the HA network can be
# created.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*network_auto_schedule*]
# (Optional) Allow auto scheduling networks to DHCP agent
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*ensure_vpnaas_package*]
# (Optional) Ensures installation of VPNaaS package before starting API service.
@ -196,7 +196,7 @@
#
# [*service_providers*]
# (Optional) (Array) Configures the service providers for neutron server.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# Example:
#
@ -213,15 +213,15 @@
# [*enable_proxy_headers_parsing*]
# (Optional) Enable paste middleware to handle SSL requests through
# HTTPProxyToWSGI middleware.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*max_request_body_size*]
# (Optional) Set max request body size
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*ovs_integration_bridge*]
# (Optional) Name of Open vSwitch bridge to use
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*igmp_snooping_enable*]
# (Optional) Enable IGMP snooping for integration bridge. If this
@ -233,7 +233,7 @@
# The switch will send unregistered multicast packets only to ports
# connected to multicast routers. This option is used by the ML2/OVN
# mechanism driver for Neutron.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
class neutron::server (
$package_ensure = 'present',
@ -246,35 +246,35 @@ class neutron::server (
$rpc_package_name = $::neutron::params::rpc_package_name,
$rpc_service_name = $::neutron::params::rpc_service_name,
$sync_db = false,
$api_workers = $::os_workers,
$rpc_workers = $::os_workers,
$rpc_state_report_workers = $::os_service_default,
$rpc_response_max_timeout = $::os_service_default,
$agent_down_time = $::os_service_default,
$enable_new_agents = $::os_service_default,
$api_workers = $facts['os_workers'],
$rpc_workers = $facts['os_workers'],
$rpc_state_report_workers = $facts['os_service_default'],
$rpc_response_max_timeout = $facts['os_service_default'],
$agent_down_time = $facts['os_service_default'],
$enable_new_agents = $facts['os_service_default'],
$router_scheduler_driver = 'neutron.scheduler.l3_agent_scheduler.ChanceScheduler',
$router_distributed = $::os_service_default,
$enable_dvr = $::os_service_default,
$network_scheduler_driver = $::os_service_default,
$dhcp_load_type = $::os_service_default,
$default_availability_zones = $::os_service_default,
$allow_automatic_l3agent_failover = $::os_service_default,
$allow_automatic_dhcp_failover = $::os_service_default,
$router_distributed = $facts['os_service_default'],
$enable_dvr = $facts['os_service_default'],
$network_scheduler_driver = $facts['os_service_default'],
$dhcp_load_type = $facts['os_service_default'],
$default_availability_zones = $facts['os_service_default'],
$allow_automatic_l3agent_failover = $facts['os_service_default'],
$allow_automatic_dhcp_failover = $facts['os_service_default'],
$l3_ha = false,
$max_l3_agents_per_router = 3,
$l3_ha_net_cidr = $::os_service_default,
$l3_ha_network_type = $::os_service_default,
$l3_ha_network_physical_name = $::os_service_default,
$network_auto_schedule = $::os_service_default,
$l3_ha_net_cidr = $facts['os_service_default'],
$l3_ha_network_type = $facts['os_service_default'],
$l3_ha_network_physical_name = $facts['os_service_default'],
$network_auto_schedule = $facts['os_service_default'],
$ensure_vpnaas_package = false,
$ensure_dr_package = false,
$vpnaas_agent_package = false,
$service_providers = $::os_service_default,
$service_providers = $facts['os_service_default'],
$auth_strategy = 'keystone',
$enable_proxy_headers_parsing = $::os_service_default,
$max_request_body_size = $::os_service_default,
$ovs_integration_bridge = $::os_service_default,
$igmp_snooping_enable = $::os_service_default,
$enable_proxy_headers_parsing = $facts['os_service_default'],
$max_request_body_size = $facts['os_service_default'],
$ovs_integration_bridge = $facts['os_service_default'],
$igmp_snooping_enable = $facts['os_service_default'],
) inherits neutron::params {
include neutron::deps

8
manifests/server/notifications.pp
View File

@ -19,15 +19,15 @@
# [*send_events_interval*]
# (optional) Number of seconds between sending events to nova if there are
# any events to send.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*http_retries*]
# (optional) Number of novaclient/ironicclient retries on failed http calls.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
class neutron::server::notifications (
$send_events_interval = $::os_service_default,
$http_retries = $::os_service_default,
$send_events_interval = $facts['os_service_default'],
$http_retries = $facts['os_service_default'],
) {
include neutron::deps

20
manifests/server/notifications/ironic.pp
View File

@ -42,7 +42,7 @@
#
# [*system_scope*]
# (optional) Scope for system operations
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*auth_url*]
# (optional) Authorization URL for connection to ironic in admin context.
@ -53,16 +53,16 @@
# [*region_name*]
# (optional) Name of ironic region to use. Useful if keystone manages more than
# one region.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*valid_interfaces*]
# (optional) Interface names used for getting the keystone endpoint for
# the ironic API. Comma separated if multiple.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*enable_notifications*]
# (optional) Send notification events to ironic
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
class neutron::server::notifications::ironic (
$password,
@ -71,11 +71,11 @@ class neutron::server::notifications::ironic (
$user_domain_name = 'Default',
$project_domain_name = 'Default',
$project_name = 'services',
$system_scope = $::os_service_default,
$system_scope = $facts['os_service_default'],
$auth_url = 'http://127.0.0.1:5000',
$region_name = $::os_service_default,
$valid_interfaces = $::os_service_default,
$enable_notifications = $::os_service_default,
$region_name = $facts['os_service_default'],
$valid_interfaces = $facts['os_service_default'],
$enable_notifications = $facts['os_service_default'],
) {
include neutron::deps
@ -84,8 +84,8 @@ class neutron::server::notifications::ironic (
$project_name_real = $project_name
$project_domain_name_real = $project_domain_name
} else {
$project_name_real = $::os_service_default
$project_domain_name_real = $::os_service_default
$project_name_real = $facts['os_service_default']
$project_domain_name_real = $facts['os_service_default']
}
neutron_config {

28
manifests/server/notifications/nova.pp
View File

@ -21,12 +21,12 @@
#
# [*notify_nova_on_port_status_changes*]
# (optional) Send notification to nova when port status is active.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*notify_nova_on_port_data_changes*]
# (optional) Send notifications to nova when port data (fixed_ips/floatingips)
# change so nova can update its cache.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*auth_type*]
# (optional) An authentication type to use with an OpenStack Identity server.
@ -51,7 +51,7 @@
#
# [*system_scope*]
# (Optional) Scope for system operations
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*auth_url*]
# (optional) Authorization URL for connection to nova in admin context.
@ -62,12 +62,12 @@
# [*region_name*]
# (optional) Name of nova region to use. Useful if keystone manages more than
# one region.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*endpoint_type*]
# (optional) The type of nova endpoint to use when looking up in
# the keystone catalog.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# DEPRECATED PARAMETERS
#
@ -75,21 +75,21 @@
# (optional) When this option is enabled, during the live migration, the OVS
# agent will only send the "vif-plugged-event" when the destination host
# interface is bound.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
class neutron::server::notifications::nova (
$password,
$notify_nova_on_port_status_changes = $::os_service_default,
$notify_nova_on_port_data_changes = $::os_service_default,
$notify_nova_on_port_status_changes = $facts['os_service_default'],
$notify_nova_on_port_data_changes = $facts['os_service_default'],
$auth_type = 'password',
$user_domain_name = 'Default',
$username = 'nova',
$project_domain_name = 'Default',
$project_name = 'services',
$system_scope = $::os_service_default,
$system_scope = $facts['os_service_default'],
$auth_url = 'http://127.0.0.1:5000',
$region_name = $::os_service_default,
$endpoint_type = $::os_service_default,
$region_name = $facts['os_service_default'],
$endpoint_type = $facts['os_service_default'],
# DEPRECATED PARAMETERS
$live_migration_events = undef,
) {
@ -105,8 +105,8 @@ and will be removed in a future release')
$project_name_real = $project_name
$project_domain_name_real = $project_domain_name
} else {
$project_name_real = $::os_service_default
$project_domain_name_real = $::os_service_default
$project_name_real = $facts['os_service_default']
$project_domain_name_real = $facts['os_service_default']
}
neutron_config {
@ -123,7 +123,7 @@ and will be removed in a future release')
}
neutron_config {
'nova/live_migration_events': value => pick($live_migration_events, $::os_service_default);
'nova/live_migration_events': value => pick($live_migration_events, $facts['os_service_default']);
'DEFAULT/notify_nova_on_port_status_changes': value => $notify_nova_on_port_status_changes;
'DEFAULT/notify_nova_on_port_data_changes': value => $notify_nova_on_port_data_changes;
}

16
manifests/server/placement.pp
View File

@ -34,7 +34,7 @@
#
# [*system_scope*]
# (Optional) Scope for system operations
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*user_domain_name*]
# (Optional) Name of domain for $username
@ -53,24 +53,24 @@
# [*region_name*]
# (optional) Name of region to use. Useful if keystone manages more than
# one region.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*endpoint_type*]
# (optional) The type endpoint to use when looking up in
# the keystone catalog.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
class neutron::server::placement (
$password,
$auth_type = 'password',
$project_domain_name = 'Default',
$project_name = 'services',
$system_scope = $::os_service_default,
$system_scope = $facts['os_service_default'],
$user_domain_name = 'Default',
$username = 'placement',
$auth_url = 'http://127.0.0.1:5000',
$region_name = $::os_service_default,
$endpoint_type = $::os_service_default,
$region_name = $facts['os_service_default'],
$endpoint_type = $facts['os_service_default'],
) {
include neutron::deps
@ -79,8 +79,8 @@ class neutron::server::placement (
$project_name_real = $project_name
$project_domain_name_real = $project_domain_name
} else {
$project_name_real = $::os_service_default
$project_domain_name_real = $::os_service_default
$project_name_real = $facts['os_service_default']
$project_domain_name_real = $facts['os_service_default']
}
neutron_config {

2
manifests/services/bgpvpn.pp
View File

@ -39,7 +39,7 @@
#
class neutron::services::bgpvpn (
$package_ensure = 'present',
$service_providers = $::os_service_default,
$service_providers = $facts['os_service_default'],
$sync_db = false,
$purge_config = false,
) {

20
manifests/services/l2gw.pp
View File

@ -4,29 +4,29 @@
#
# [*default_interface_name*]
# (optional) default interface name of the l2 gateway
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
# Example: FortyGigE1/0/1
#
# [*default_device_name*]
# (optional) default device name of the l2 gateway
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
# Example: Switch1
#
# [*quota_l2_gateway*]
# (optional) quota of the l2 gateway
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
# Example: 10
#
# [*periodic_monitoring_interval*]
# (optional) The periodic interval at which the plugin
# checks for the monitoring L2 gateway agent
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
# Example: 5
#
# [*service_providers*]
# (optional) Array of allowed service types includes L2GW
# Must be in form: <service_type>:<name>:<driver>[:default]
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*sync_db*]
# Whether 'l2gw-db-sync' should run to create and/or synchronize the
@ -43,11 +43,11 @@
# Defaults to false.
#
class neutron::services::l2gw (
$default_interface_name = $::os_service_default,
$default_device_name = $::os_service_default,
$quota_l2_gateway = $::os_service_default,
$periodic_monitoring_interval = $::os_service_default,
$service_providers = $::os_service_default,
$default_interface_name = $facts['os_service_default'],
$default_device_name = $facts['os_service_default'],
$quota_l2_gateway = $facts['os_service_default'],
$periodic_monitoring_interval = $facts['os_service_default'],
$service_providers = $facts['os_service_default'],
$sync_db = false,
$package_ensure = 'present',
$purge_config = false,

8
manifests/services/sfc.pp
View File

@ -27,11 +27,11 @@
#
# [*sfc_driver*]
# (optional) SFC driver to use
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*fc_driver*]
# (optional) Flow classifier driver to use
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*sync_db*]
# Whether 'sfc-db-sync' should run to create and/or synchronize the
@ -44,8 +44,8 @@
#
class neutron::services::sfc (
$package_ensure = 'present',
$sfc_driver = $::os_service_default,
$fc_driver = $::os_service_default,
$sfc_driver = $facts['os_service_default'],
$fc_driver = $facts['os_service_default'],
$sync_db = false,
$purge_config = false,
) {

8
manifests/wsgi/apache.pp
View File

@ -24,7 +24,7 @@
#
# [*servername*]
# The servername for the virtualhost.
# Optional. Defaults to $::fqdn
# Optional. Defaults to $facts['networking']['fqdn']
#
# [*port*]
# The port.
@ -44,7 +44,7 @@
#
# [*workers*]
# Number of WSGI workers to spawn.
# Optional. Defaults to $::os_workers
# Optional. Defaults to $facts['os_workers']
#
# [*priority*]
# (optional) The priority for the vhost.
@ -123,12 +123,12 @@
# class { 'neutron::wsgi::apache': }
#
class neutron::wsgi::apache (
$servername = $::fqdn,
$servername = $facts['networking']['fqdn'],
$port = 9696,
$bind_host = undef,
$path = '/',
$ssl = false,
$workers = $::os_workers,
$workers = $facts['os_workers'],
$ssl_cert = undef,
$ssl_key = undef,
$ssl_chain = undef,

6
manifests/wsgi/uwsgi.pp
View File

@ -11,7 +11,7 @@
#
# [*processes*]
# (Optional) Number of processes.
# Defaults to $::os_workers.
# Defaults to $facts['os_workers'].
#
# [*threads*]
# (Optional) Number of threads.
@ -22,14 +22,14 @@
# Defaults to 100
#
class neutron::wsgi::uwsgi (
$processes = $::os_workers,
$processes = $facts['os_workers'],
$threads = 32,
$listen_queue_size = 100,
){
include neutron::deps
if $::operatingsystem != 'Debian'{
if $facts['os']['name'] != 'Debian'{
warning('This class is only valid for Debian, as other operating systems are not using uwsgi by default.')
}

2
spec/classes/neutron_agents_bagpipe_spec.rb
View File

@ -110,7 +110,7 @@ describe 'neutron::agents::bagpipe' do
end
let (:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'RedHat'
{ :bagpipe_bgp_package => 'openstack-bagpipe-bgp' }
when 'Debian'

10
spec/classes/neutron_agents_bgp_dragent_spec.rb
View File

@ -38,7 +38,7 @@ describe 'neutron::agents::bgp_dragent' do
it { should contain_resources('neutron_bgp_dragent_config').with_purge(default_params[:purge_config]) }
it { should contain_neutron_bgp_dragent_config('bgp/bgp_speaker_driver').with_value(default_params[:bgp_speaker_driver]) }
it { should contain_neutron_bgp_dragent_config('bgp/bgp_router_id').with_value(facts[:ipaddress]) }
it { should contain_neutron_bgp_dragent_config('bgp/bgp_router_id').with_value(facts[:networking]['ip']) }
end
context 'with overridden params' do
@ -225,11 +225,11 @@ describe 'neutron::agents::bgp_dragent' do
}).each do |os,facts|
context "on #{os}" do
let (:facts) do
facts.merge(OSDefaults.get_facts({:ipaddress => '1.2.3.4'}))
facts.merge(OSDefaults.get_facts())
end
let (:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'RedHat'
{
:dynamic_routing_package => false,
@ -247,11 +247,11 @@ describe 'neutron::agents::bgp_dragent' do
it_behaves_like 'neutron::agents::bgp_dragent'
case facts[:osfamily]
case facts[:os]['family']
when 'RedHat'
it_behaves_like 'neutron::agents::bgp_dragent on RedHat'
when 'Debian'
it_behaves_like "neutron::agents::bgp_dragent on #{facts[:operatingsystem]}"
it_behaves_like "neutron::agents::bgp_dragent on #{facts[:os]['name']}"
end
end
end

4
spec/classes/neutron_agents_dhcp_spec.rb
View File

@ -234,7 +234,7 @@ describe 'neutron::agents::dhcp' do
end
let (:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{
:dhcp_agent_package => 'neutron-dhcp-agent',
@ -249,7 +249,7 @@ describe 'neutron::agents::dhcp' do
it_behaves_like 'neutron::agents::dhcp'
if facts[:osfamily] == 'Debian'
if facts[:os]['family'] == 'Debian'
it_behaves_like 'neutron::agents::dhcp on Debian'
end
end

2
spec/classes/neutron_agents_l2gw_spec.rb
View File

@ -99,7 +99,7 @@ describe 'neutron::agents::l2gw' do
end
let (:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'RedHat'
{ :l2gw_agent_package_name => 'openstack-neutron-l2gw-agent' }
when 'Debian'

2
spec/classes/neutron_agents_l3_spec.rb
View File

@ -184,7 +184,7 @@ describe 'neutron::agents::l3' do
end
let (:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{
:l3_agent_package => 'neutron-l3-agent',

4
spec/classes/neutron_agents_metadata_spec.rb
View File

@ -106,7 +106,7 @@ describe 'neutron::agents::metadata' do
end
let (:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{
:metadata_agent_package => 'neutron-metadata-agent',
@ -122,7 +122,7 @@ describe 'neutron::agents::metadata' do
it_behaves_like 'neutron metadata agent'
it_behaves_like 'neutron metadata agent with auth_ca_cert set'
if facts[:osfamily] == 'Debian'
if facts[:os]['family'] == 'Debian'
it_behaves_like 'neutron::agents::metadata on Debian'
end
end

4
spec/classes/neutron_agents_metering_spec.rb
View File

@ -124,7 +124,7 @@ describe 'neutron::agents::metering' do
end
let (:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{
:metering_agent_package => 'neutron-metering-agent',
@ -140,7 +140,7 @@ describe 'neutron::agents::metering' do
it_behaves_like 'neutron metering agent'
if facts[:osfamily] == 'Debian'
if facts[:os]['family'] == 'Debian'
it_behaves_like 'neutron metering agent on Debian'
end
end

2
spec/classes/neutron_agents_ml2_linuxbridge_spec.rb
View File

@ -158,7 +158,7 @@ describe 'neutron::agents::ml2::linuxbridge' do
end
let (:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{
:linuxbridge_agent_package => 'neutron-linuxbridge-agent',

2
spec/classes/neutron_agents_ml2_macvtap_spec.rb
View File

@ -76,7 +76,7 @@ describe 'neutron::agents::ml2::macvtap' do
end
let (:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{
:macvtap_agent_package => 'neutron-macvtap-agent',

2
spec/classes/neutron_agents_ml2_mlnx_spec.rb
View File

@ -103,7 +103,7 @@ describe 'neutron::agents::ml2::mlnx' do
end
let (:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{
:mlnx_agent_package => 'neutron-mlnx-agent',

2
spec/classes/neutron_agents_ml2_networking_baremetal_spec.rb
View File

@ -127,7 +127,7 @@ describe 'neutron::agents::ml2::networking_baremetal' do
end
let (:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{ :networking_baremetal_agent_package => 'ironic-neutron-agent',
:networking_baremetal_agent_service => 'ironic-neutron-agent' }

4
spec/classes/neutron_agents_ml2_ovs_spec.rb
View File

@ -533,7 +533,7 @@ describe 'neutron::agents::ml2::ovs' do
end
let (:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{ :ovs_agent_package => 'neutron-openvswitch-agent',
:ovs_agent_service => 'neutron-openvswitch-agent' }
@ -546,7 +546,7 @@ describe 'neutron::agents::ml2::ovs' do
end
it_behaves_like 'neutron plugin ovs agent with ml2 plugin'
it_behaves_like "neutron::agents::ml2::ovs on #{facts[:osfamily]}"
it_behaves_like "neutron::agents::ml2::ovs on #{facts[:os]['family']}"
end
end
end

2
spec/classes/neutron_agents_ml2_sriov_spec.rb
View File

@ -191,7 +191,7 @@ describe 'neutron::agents::ml2::sriov' do
end
let (:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{
:sriov_nic_agent_package => 'neutron-sriov-agent',

2
spec/classes/neutron_agents_ovn_metadata_spec.rb
View File

@ -112,7 +112,7 @@ describe 'neutron::agents::ovn_metadata' do
end
let (:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{ :ovn_metadata_agent_package => 'neutron-ovn-metadata-agent',
:ovn_metadata_agent_service => 'neutron-ovn-metadata-agent' }

6
spec/classes/neutron_agents_vpnaas_spec.rb
View File

@ -125,7 +125,7 @@ describe 'neutron::agents::vpnaas' do
end
let (:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{
:openswan_package => 'strongswan',
@ -140,9 +140,9 @@ describe 'neutron::agents::vpnaas' do
end
end
it_behaves_like "neutron::agents::vpnaas on #{facts[:osfamily]}"
it_behaves_like "neutron::agents::vpnaas on #{facts[:os]['family']}"
if facts[:osfamily] == 'RedHat'
if facts[:os]['family'] == 'RedHat'
it_behaves_like 'neutron vpnaas agent'
end
end

2
spec/classes/neutron_client_spec.rb
View File

@ -25,7 +25,7 @@ describe 'neutron::client' do
end
let :platform_params do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{ :client_package => 'python3-neutronclient' }
when 'RedHat'

5
spec/classes/neutron_db_sync_spec.rb
View File

@ -81,10 +81,7 @@ describe 'neutron::db::sync' do
}).each do |os,facts|
context "on #{os}" do
let (:facts) do
facts.merge(OSDefaults.get_facts({
:processorcount => 8,
:concat_basedir => '/var/lib/puppet/concat'
}))
facts.merge(OSDefaults.get_facts())
end
it_behaves_like 'neutron-dbsync'

2
spec/classes/neutron_init_spec.rb
View File

@ -492,7 +492,7 @@ describe 'neutron' do
end
let (:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{
:common_package_name => 'neutron-common'

3
spec/classes/neutron_plugins_ml2_arista_l3_spec.rb
View File

@ -81,8 +81,7 @@ describe 'neutron::plugins::ml2::arista::l3' do
context "on #{os}" do
let(:facts) do
facts.merge!(OSDefaults.get_facts({
}))
facts.merge!(OSDefaults.get_facts())
end
it_behaves_like 'neutron plugin ml2 arista l3_arista'

2
spec/classes/neutron_plugins_ml2_bagpipe_spec.rb
View File

@ -41,7 +41,7 @@ describe 'neutron::plugins::ml2::bagpipe' do
end
let (:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{ :bagpipe_package_name => 'python3-networking-bagpipe' }
when 'RedHat'

2
spec/classes/neutron_plugins_ml2_mellanox_spec.rb
View File

@ -35,7 +35,7 @@ describe 'neutron::plugins::ml2::mellanox' do
end
let (:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{
:mlnx_plugin_package => 'python3-networking-mlnx',

2
spec/classes/neutron_plugins_ml2_networking_baremetal_spec.rb
View File

@ -37,7 +37,7 @@ describe 'neutron::plugins::ml2::networking_baremetal' do
facts.merge!(OSDefaults.get_facts())
end
let (:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{ :networking_baremetal_package => 'python3-ironic-neutron-agent'}
when 'RedHat'

2
spec/classes/neutron_plugins_ml2_nuage_spec.rb
View File

@ -100,7 +100,7 @@ describe 'neutron::plugins::ml2::nuage' do
end
it_behaves_like 'neutron plugin ml2 nuage'
it_behaves_like "neutron plugin ml2 nuage on #{facts[:osfamily]}"
it_behaves_like "neutron plugin ml2 nuage on #{facts[:os]['family']}"
end
end
end

10
spec/classes/neutron_plugins_ml2_spec.rb
View File

@ -333,9 +333,9 @@ describe 'neutron::plugins::ml2' do
end
let (:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
if facts[:operatingsystem] == 'Ubuntu'
if facts[:os]['name'] == 'Ubuntu'
{
:ml2_server_package => 'neutron-plugin-ml2'
}
@ -351,10 +351,10 @@ describe 'neutron::plugins::ml2' do
it_behaves_like 'neutron plugin ml2'
if facts[:osfamily] == 'Debian'
it_behaves_like "neutron plugin ml2 on #{facts[:operatingsystem]}"
if facts[:os]['family'] == 'Debian'
it_behaves_like "neutron plugin ml2 on #{facts[:os]['name']}"
else
it_behaves_like "neutron plugin ml2 on #{facts[:osfamily]}"
it_behaves_like "neutron plugin ml2 on #{facts[:os]['family']}"
end
end
end

2
spec/classes/neutron_plugins_opencontrail_spec.rb
View File

@ -70,7 +70,7 @@ describe 'neutron::plugins::opencontrail' do
end
it_behaves_like 'neutron::plugins::contrail'
it_behaves_like "neutron::plugins::opencontrail on #{facts[:osfamily]}"
it_behaves_like "neutron::plugins::opencontrail on #{facts[:os]['family']}"
end
end
end

6
spec/classes/neutron_server_spec.rb
View File

@ -395,9 +395,9 @@ describe 'neutron::server' do
end
let (:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
if facts[:operatingsystem] == 'Ubuntu'
if facts[:os]['name'] == 'Ubuntu'
{
:server_package => 'neutron-server',
:server_service => 'neutron-server',
@ -419,7 +419,7 @@ describe 'neutron::server' do
it_behaves_like 'a neutron server'
it_behaves_like 'a neutron server without database synchronization'
it_behaves_like "neutron server dynamic routing on #{facts[:osfamily]}"
it_behaves_like "neutron server dynamic routing on #{facts[:os]['family']}"
end
end
end

2
spec/classes/neutron_services_bgpvpn_spec.rb
View File

@ -84,7 +84,7 @@ describe 'neutron::services::bgpvpn' do
end
let (:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{ :bgpvpn_package_name => 'python3-networking-bgpvpn' }
when 'RedHat'

2
spec/classes/neutron_services_l2gw_spec.rb
View File

@ -100,7 +100,7 @@ describe 'neutron::services::l2gw' do
end
let (:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{ :l2gw_agent_package_name => 'python3-networking-l2gw' }
when 'RedHat'

2
spec/classes/neutron_services_sfc_spec.rb
View File

@ -83,7 +83,7 @@ describe 'neutron::services::sfc' do
end
let (:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{ :sfc_package_name => 'python3-networking-sfc' }
when 'RedHat'

8
spec/classes/neutron_wsgi_apache_spec.rb
View File

@ -9,7 +9,7 @@ describe 'neutron::wsgi::apache' do
:group => 'neutron',
:path => '/',
:priority => 10,
:servername => facts[:fqdn],
:servername => 'foo.example.com',
:ssl => false,
:threads => 1,
:user => 'neutron',
@ -144,14 +144,12 @@ describe 'neutron::wsgi::apache' do
context "on #{os}" do
let (:facts) do
facts.merge!(OSDefaults.get_facts({
:os_workers => 8,
:concat_basedir => '/var/lib/puppet/concat',
:fqdn => 'some.host.tld'
:os_workers => 8,
}))
end
let(:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{
:wsgi_script_path => '/usr/lib/cgi-bin/neutron',