openstack
/
fuel-library
Code Issues Proposed changes

Puppet4 support: l23network manifests 

* Misc fixes in the l23 manifests

Related-Bug: 1586480
Change-Id: I352d78203f2f62b6780c3b1cbcb487c89b0c0ebe
This commit is contained in:
Dmitry Ilyin 2016-06-07 17:58:37 +03:00
parent 9c5fc0f142
commit 50eb9b76ec
9 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
deployment/puppet/l23network/manifests/l2/bond.pp
View File

@ -35,7 +35,7 @@
#
define l23network::l2::bond (
$ensure = present,
$ensure = 'present',
$bond = $name,
$use_ovs = $::l23network::use_ovs,
$interfaces = undef,
@ -49,7 +49,6 @@ define l23network::l2::bond (
$monolith_bond_providers = undef,
$provider = undef,
) {
include ::stdlib
include ::l23network::params
$actual_monolith_bond_providers = $monolith_bond_providers ? {
@ -206,7 +205,7 @@ define l23network::l2::bond (
}
}
if (! defined(L23network::L2::Bridge[$bridge]) and $provider == 'ovs') {
if $bridge and (! defined(L23network::L2::Bridge[$bridge]) and $provider == 'ovs') {
l23network::l2::bridge { $bridge:
ensure => 'present',
provider => $provider,
@ -267,14 +266,14 @@ define l23network::l2::bond (
if $::l23_os =~ /(?i:redhat|centos|oraclelinux)/ {
if $delay_while_up {
file {"${::l23network::params::interfaces_dir}/interface-up-script-${bond}":
ensure => present,
ensure => 'present',
owner => 'root',
mode => '0755',
content => template('l23network/centos_post_up.erb'),
} -> L23_stored_config <| title == $bond |>
} else {
file {"${::l23network::params::interfaces_dir}/interface-up-script-${bond}":
ensure => absent,
ensure => 'absent',
} -> L23_stored_config <| title == $bond |>
}
}

3
deployment/puppet/l23network/manifests/l2/bond_interface.pp
View File

@ -3,14 +3,13 @@
define l23network::l2::bond_interface (
$bond,
$use_ovs = $::l23network::use_ovs,
$ensure = present,
$ensure = 'present',
$mtu = undef,
$bond_is_master = true,
$interface_properties = {},
$provider = undef,
) {
include ::l23network::params
include ::stdlib
if $bond_is_master {
$master = $bond

7
deployment/puppet/l23network/manifests/l2/bridge.pp
View File

@ -12,7 +12,7 @@
# http://openvswitch.org/cgi-bin/ovsman.cgi?page=utilities%2Fovs-vsctl.8
#
define l23network::l2::bridge (
$ensure = present,
$ensure = 'present',
$use_ovs = $::l23network::use_ovs,
$mtu = undef,
$stp = undef,
@ -23,7 +23,6 @@ define l23network::l2::bridge (
$vendor_specific = {},
$provider = undef,
) {
include ::stdlib
include ::l23network::params
if ! defined (L2_bridge[$name]) {
@ -72,14 +71,14 @@ define l23network::l2::bridge (
if $::l23_os =~ /(?i:redhat|centos|oraclelinux)/ {
if $delay_while_up {
file {"${::l23network::params::interfaces_dir}/interface-up-script-${name}":
ensure => present,
ensure => 'present',
owner => 'root',
mode => '0755',
content => template('l23network/centos_post_up.erb'),
} -> L23_stored_config <| title == $name |>
} else {
file {"${::l23network::params::interfaces_dir}/interface-up-script-${name}":
ensure => absent,
ensure => 'absent',
} -> L23_stored_config <| title == $name |>
}
}

8
deployment/puppet/l23network/manifests/l2/centos_upndown_scripts.pp
View File

@ -1,25 +1,25 @@
# see http://tech.serbinn.net/2012/custom-script-on-interface-up-down-centos-and-rhel/
class l23network::l2::centos_upndown_scripts {
file {'/sbin/ifup-local':
ensure => present,
ensure => 'present',
owner => 'root',
mode => '0755',
source => 'puppet:///modules/l23network/centos_ifup-local',
} ->
file {'/sbin/ifdown-local':
ensure => present,
ensure => 'present',
owner => 'root',
mode => '0755',
source => 'puppet:///modules/l23network/centos_ifdown-local',
} ->
file {'/sbin/ifup-pre-local':
ensure => present,
ensure => 'present',
owner => 'root',
mode => '0755',
source => 'puppet:///modules/l23network/centos_ifup-pre-local',
} ->
file {'/etc/sysconfig/network-scripts/ifup-sriov':
ensure => present,
ensure => 'present',
owner => 'root',
mode => '0755',
source => 'puppet:///modules/l23network/centos_ifup-sriov',

12
deployment/puppet/l23network/manifests/l2/dpdk.pp
View File

@ -49,14 +49,14 @@ class l23network::l2::dpdk (
$dpdk_interfaces = get_dpdk_interfaces()
file {$dpdk_dir:
ensure => directory,
ensure => 'directory',
} ->
file {$dpdk_conf_file:
ensure => present,
ensure => 'present',
source => 'puppet:///modules/l23network/dpdk.conf',
} ->
file {$dpdk_interfaces_file:
ensure => present,
ensure => 'present',
content => template('l23network/dpdk_interfaces.erb'),
}
File[$dpdk_interfaces_file] ~> Service['dpdk']
@ -91,7 +91,7 @@ class l23network::l2::dpdk (
# Configure OpenVSwitch to use DPDK
if $ovs_default_file {
file {$ovs_default_file:
ensure => present,
ensure => 'present',
content => template('l23network/openvswitch_default_Debian.erb'),
} ~> Service['openvswitch-service']
}
@ -125,13 +125,13 @@ class l23network::l2::dpdk (
# Install ifupdown scripts
if $::l23_os =~ /(?i)ubuntu/ {
file {'/etc/network/if-pre-up.d/ovsdpdk':
ensure => present,
ensure => 'present',
owner => 'root',
mode => '0755',
source => 'puppet:///modules/l23network/debian_ovsdpdk',
} ->
file {'/etc/network/if-post-down.d/ovsdpdk':
ensure => present,
ensure => 'present',
owner => 'root',
mode => '0755',
source => 'puppet:///modules/l23network/debian_ovsdpdk',

4
deployment/puppet/l23network/manifests/l2/patch.pp
View File

@ -16,14 +16,12 @@
define l23network::l2::patch (
$bridges,
$use_ovs = $::l23network::use_ovs,
$ensure = present,
$ensure = 'present',
$mtu = 65000,
$vlan_ids = undef,
$vendor_specific = undef,
$provider = undef,
) {
include ::stdlib
include ::l23network::params
# Architecture limitation.

5
deployment/puppet/l23network/manifests/l2/port.pp
View File

@ -29,7 +29,7 @@
# Must be true or false.
#
define l23network::l2::port (
$ensure = present,
$ensure = 'present',
$use_ovs = $::l23network::use_ovs,
$port = $name,
$if_type = undef,
@ -52,7 +52,6 @@ define l23network::l2::port (
# $trunks = [],
) {
include ::stdlib
include ::l23network::params
# Detect VLAN mode configuration
@ -123,7 +122,7 @@ define l23network::l2::port (
# the device is treated as an Ethernet device
# https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/6/html/Deployment_Guide/s2-networkscripts-interfaces_network-bridge.html
if $provider =~ /ovs/ {
if $provider and $provider =~ /ovs/ {
$real_if_type = 'ethernet'
} else {
$real_if_type = $if_type

2
deployment/puppet/l23network/manifests/l3/ifconfig.pp
View File

@ -53,7 +53,7 @@
#
define l23network::l3::ifconfig (
$ensure = present,
$ensure = 'present',
$interface = $name,
$ipaddr = undef,
$gateway = undef,

2
deployment/puppet/l23network/manifests/l3/route.pp
View File

@ -7,7 +7,7 @@ define l23network::l3::route (
$vendor_specific = undef,
$by_network_scheme = false,
$provider = undef,
$ensure = present,
$ensure = 'present',
) {
include ::l23network::params