meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppet-network/puppet-network-updates-for-poky-stx.patch

   1 diff --git a/manifests/bond/poky-stx.pp b/manifests/bond/poky-stx.pp
   2 new file mode 100644
   3 index 0000000..c6af9c9
   4 --- /dev/null
   5 +++ b/manifests/bond/poky-stx.pp
   6 @@ -0,0 +1,56 @@
   7 +# = Define: network::bond::poky-stx
   8 +#
   9 +# Instantiate bonded interfaces on Debian based systems.
  10 +#
  11 +# == See also
  12 +#
  13 +# * Debian Network Bonding http://wiki.wrlinux.org/Bonding
  14 +define network::bond::poky-stx(
  15 +  $slaves,
  16 +  $ensure    = present,
  17 +  $ipaddress = undef,
  18 +  $netmask   = undef,
  19 +  $method    = undef,
  20 +  $family    = undef,
  21 +  $onboot    = undef,
  22 +
  23 +  $mode             = undef,
  24 +  $miimon           = undef,
  25 +  $downdelay        = undef,
  26 +  $updelay          = undef,
  27 +  $lacp_rate        = undef,
  28 +  $primary          = undef,
  29 +  $primary_reselect = undef,
  30 +  $xmit_hash_policy = undef,
  31 +) {
  32 +
  33 +  $raw = {
  34 +    'bond-slaves'    => join($slaves, ' '),
  35 +    'bond-mode'      => $mode,
  36 +    'bond-miimon'    => $miimon,
  37 +    'bond-downdelay' => $downdelay,
  38 +    'bond-updelay'   => $updelay,
  39 +    'bond-lacp-rate' => $lacp_rate,
  40 +    'bond-primary'   => $primary,
  41 +    'bond-primary-reselect' => $primary_reselect,
  42 +    'bond-xmit-hash-policy' => $xmit_hash_policy,
  43 +  }
  44 +
  45 +  $opts = compact_hash($raw)
  46 +
  47 +  network_config { $name:
  48 +    ensure    => $ensure,
  49 +    ipaddress => $ipaddress,
  50 +    netmask   => $netmask,
  51 +    family    => $family,
  52 +    method    => $method,
  53 +    onboot    => $onboot,
  54 +    options   => $opts,
  55 +  }
  56 +
  57 +  network_config { $slaves:
  58 +    ensure      => absent,
  59 +    reconfigure => true,
  60 +    before      => Network_config[$name],
  61 +  }
  62 +}
  63 diff --git a/manifests/bond/setup.pp b/manifests/bond/setup.pp
  64 index 0a30767..780722c 100644
  65 --- a/manifests/bond/setup.pp
  66 +++ b/manifests/bond/setup.pp
  67 @@ -6,8 +6,10 @@ class network::bond::setup {
  68        # is available by default
  69      }
  70      Debian: {
  71 -      package { 'ifenslave-2.6':
  72 -        ensure => present,
  73 +      if $::operatingsystem != 'poky-stx' {
  74 +        package { 'ifenslave-2.6':
  75 +          ensure => present,
  76 +        }
  77        }
  78      }
  79      WRLinux: {
  80 diff --git a/manifests/bond.pp b/manifests/bond.pp
  81 index 26ca104..5f8e254 100644
  82 --- a/manifests/bond.pp
  83 +++ b/manifests/bond.pp
  84 @@ -164,28 +164,51 @@ define network::bond(
  85
  86    case $::osfamily {
  87      Debian: {
  88 -      network::bond::debian { $name:
  89 -        ensure           => $ensure,
  90 -        slaves           => $slaves,
  91 -        ipaddress        => $ipaddress,
  92 -        netmask          => $netmask,
  93 -        method           => $method,
  94 -        family           => $family,
  95 -        onboot           => $onboot,
  96 -        hotplug          => $hotplug,
  97 -        options          => $options,
  98 -        slave_options    => $slave_options,
  99 +      if $::operatingsystem == 'poky-stx' {
 100 +        network::bond::poky-stx { $name:
 101 +          slaves    => $slaves,
 102 +          ensure    => $ensure,
 103 +          ipaddress => $ipaddress,
 104 +          netmask   => $netmask,
 105 +          method    => $method,
 106 +          family    => $family,
 107 +          onboot    => $onboot,
 108
 109 -        mode             => $mode,
 110 -        miimon           => $miimon,
 111 -        downdelay        => $downdelay,
 112 -        updelay          => $updelay,
 113 -        lacp_rate        => $lacp_rate,
 114 -        primary          => $primary,
 115 -        primary_reselect => $primary_reselect,
 116 -        xmit_hash_policy => $xmit_hash_policy,
 117 +          mode             => $mode,
 118 +          miimon           => $miimon,
 119 +          downdelay        => $downdelay,
 120 +          updelay          => $updelay,
 121 +          lacp_rate        => $lacp_rate,
 122 +          primary          => $primary,
 123 +          primary_reselect => $primary_reselect,
 124 +          xmit_hash_policy => $xmit_hash_policy,
 125
 126 -        require          => Kmod::Alias[$name],
 127 +          require   => Kmod::Alias[$name],
 128 +        }
 129 +      } else {
 130 +        network::bond::debian { $name:
 131 +          ensure           => $ensure,
 132 +          slaves           => $slaves,
 133 +          ipaddress        => $ipaddress,
 134 +          netmask          => $netmask,
 135 +          method           => $method,
 136 +          family           => $family,
 137 +          onboot           => $onboot,
 138 +          hotplug          => $hotplug,
 139 +          options          => $options,
 140 +          slave_options    => $slave_options,
 141 +
 142 +          mode             => $mode,
 143 +          miimon           => $miimon,
 144 +          downdelay        => $downdelay,
 145 +          updelay          => $updelay,
 146 +          lacp_rate        => $lacp_rate,
 147 +          primary          => $primary,
 148 +          primary_reselect => $primary_reselect,
 149 +          xmit_hash_policy => $xmit_hash_policy,
 150 +
 151 +          require          => Kmod::Alias[$name],
 152 +        }
 153        }
 154      }
 155      WRLinux: {