This repository has been archived by the owner on Aug 8, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
(SIMP-1695) Update for Puppet 4 (#5)
- Loading branch information
1 parent
1c51187
commit eda1713
Showing
15 changed files
with
124 additions
and
206 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,6 @@ | ||
| --log-format="%{path}:%{line}:%{check}:%{KIND}:%{message}" | ||
| --relative | ||
| --no-class_inherits_from_params_class-check | ||
| --no-80chars-check | ||
| --no-140chars-check | ||
| --no-trailing_comma-check | ||
| --no-empty_string_assignment-check |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,7 @@ | ||
| * Wed Jan 04 2016 Nick Miller <[email protected]> - 5.0.0-0 | ||
| - Strong typed module | ||
| - Renamed $cluster_nets to the catalyst $trusted_nets | ||
|
|
||
| * Tue Aug 02 2016 Trevor Vaughan <[email protected]> - 4.1.1-0 | ||
| - Update to the new package naming convention | ||
|
|
||
|
|
||
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,5 @@ | ||
| # == Class: gfs2::cluster_allow | ||
| # | ||
| # This function opens the following ports and connection types for the provided | ||
| # $cluster_nets. | ||
| # $trusted_nets. | ||
| # | ||
| # Port Number(s) Type Use | ||
| # 1229 UDP fencing access | ||
|
|
@@ -15,69 +13,65 @@ | |
| # 50006 50008 50009 TCP ccsd access | ||
| # 50007 UDP ccsd access | ||
| # | ||
| # == Parameters | ||
| # | ||
| # [*cluster_nets*] | ||
| # For the widest subnet accessibility, set $cluster_nets to | ||
| # nets2cidr(hiera('client_nets')). | ||
| # | ||
| # == Authors | ||
| # @param trusted_nets | ||
| # For the widest subnet accessibility, set $trusted_nets to | ||
| # nets2cidr(hiera('trusted_nets')). | ||
| # | ||
| # * Trevor Vaughan <[email protected]> | ||
| # @author Trevor Vaughan <[email protected]> | ||
| # | ||
| class gfs2::cluster_allow ( | ||
| $cluster_nets | ||
| Simplib::Netlist $trusted_nets = simplib::lookup('simp_options::trusted_nets', { 'default_value' => ['127.0.0.1'] }), | ||
| ) { | ||
|
|
||
| iptables::add_udp_listen { 'allow_cman': | ||
| client_nets => $cluster_nets, | ||
| dports => ['5404','5405','6809'] | ||
| iptables::listen::udp { 'allow_cman': | ||
| trusted_nets => $trusted_nets, | ||
| dports => [ 5404,5405,6809 ] | ||
| } | ||
|
|
||
| # Conga | ||
| iptables::add_tcp_stateful_listen { 'allow_ricci': | ||
| client_nets => $cluster_nets, | ||
| dports => '11111' | ||
| iptables::listen::tcp_stateful { 'allow_ricci': | ||
| trusted_nets => $trusted_nets, | ||
| dports => [ 11111 ] | ||
| } | ||
|
|
||
| iptables::add_udp_listen { 'allow_ricci': | ||
| client_nets => $cluster_nets, | ||
| dports => '11111', | ||
| require => Service['ricci'] | ||
| iptables::listen::udp { 'allow_ricci': | ||
| trusted_nets => $trusted_nets, | ||
| dports => [ 11111 ], | ||
| require => Service['ricci'] | ||
| } | ||
|
|
||
| iptables::add_tcp_stateful_listen { 'allow_gnbd': | ||
| client_nets => $cluster_nets, | ||
| dports => '14567' | ||
| iptables::listen::tcp_stateful { 'allow_gnbd': | ||
| trusted_nets => $trusted_nets, | ||
| dports => [ 14567 ] | ||
| } | ||
|
|
||
| iptables::add_tcp_stateful_listen { 'allow_modclusterd': | ||
| client_nets => $cluster_nets, | ||
| dports => '16851' | ||
| iptables::listen::tcp_stateful { 'allow_modclusterd': | ||
| trusted_nets => $trusted_nets, | ||
| dports => [ 16851 ] | ||
| } | ||
|
|
||
| iptables::add_tcp_stateful_listen { 'allow_dlm': | ||
| client_nets => $cluster_nets, | ||
| dports => '21064' | ||
| iptables::listen::tcp_stateful { 'allow_dlm': | ||
| trusted_nets => $trusted_nets, | ||
| dports => [ 21064 ] | ||
| } | ||
|
|
||
| iptables::add_tcp_stateful_listen { 'allow_ccsd': | ||
| client_nets => $cluster_nets, | ||
| dports => [ '50006', '50008', '50009' ] | ||
| iptables::listen::tcp_stateful { 'allow_ccsd': | ||
| trusted_nets => $trusted_nets, | ||
| dports => [ 50006,50008,50009 ] | ||
| } | ||
|
|
||
| iptables::add_udp_listen { 'allow_ccsd': | ||
| client_nets => $cluster_nets, | ||
| dports => '50007' | ||
| iptables::listen::udp { 'allow_ccsd': | ||
| trusted_nets => $trusted_nets, | ||
| dports => [ 50007 ] | ||
| } | ||
|
|
||
| iptables::add_udp_listen { 'allow_fencing': | ||
| client_nets => $cluster_nets, | ||
| dports => '1229' | ||
| iptables::listen::udp { 'allow_fencing': | ||
| trusted_nets => $trusted_nets, | ||
| dports => [ 1229 ] | ||
| } | ||
|
|
||
| iptables_rule { 'allow_cluster_multicast': | ||
| order => '6', | ||
| content => "-s ${cluster_nets} -m addrtype --src-type MULTICAST -j ACCEPT" | ||
| order => 6, | ||
| content => "-s ${trusted_nets} -m addrtype --src-type MULTICAST -j ACCEPT" | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,13 @@ | ||
| # == Class: gfs2 | ||
| # | ||
| # This class supports the Global File System. It ensures that the | ||
| # appropriate files are in the appropriate places and that the necessary | ||
| # packages and services are present. | ||
| # | ||
| # == Notes | ||
| # | ||
| # This module is incompatible with the acpid module. | ||
| # | ||
| # == Authors | ||
| # | ||
| # * Trevor Vaughan <[email protected]> | ||
| # @author Trevor Vaughan <[email protected]> | ||
| # | ||
| class gfs2 { | ||
| include 'network' | ||
| include '::network' | ||
|
|
||
| file { '/etc/cluster': | ||
| ensure => 'directory', | ||
|
|
@@ -23,7 +17,7 @@ | |
| } | ||
|
|
||
| iptables_rule { 'allow_anycast_multicast': | ||
| order => '5', | ||
| order => 5, | ||
| content => '-s 224.0.0.1 -m addrtype --src-type MULTICAST -j ACCEPT', | ||
| require => Package['ricci'] | ||
| } | ||
|
|
@@ -35,10 +29,10 @@ | |
| # For the SCSI Fence | ||
| package { 'sg3_utils': ensure => 'latest' } | ||
|
|
||
| if $::virtual and ( ( $::virtual == 'xenu' ) or ( $::virtual == 'xen0' ) ) { | ||
| if $facts['virtual'] and ( ( $facts['virtual'] == 'xenu' ) or ( $facts['virtual'] == 'xen0' ) ) { | ||
| package { [ | ||
| 'kmod-gnbd-xen', | ||
| "libvirt.${::hardwaremodel}" ]: | ||
| "libvirt.${facts['hardwaremodel']}" ]: | ||
| ensure => 'latest' | ||
| } | ||
| } | ||
|
|
||
Oops, something went wrong.