[MediaWiki-commits] [Gerrit] interface: drop support for Ubuntu 10.04 - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178484
Change subject: interface: drop support for Ubuntu 10.04
..
interface: drop support for Ubuntu 10.04
Change-Id: Ifb5f1761c63971f0d6320c3f8631b3857a325de2
---
M modules/interface/manifests/aggregate.pp
M modules/interface/manifests/ip.pp
M modules/interface/manifests/manual.pp
M modules/interface/manifests/setting.pp
M modules/interface/manifests/tagged.pp
M modules/interface/manifests/tun6to4.pp
M modules/interface/manifests/up_command.pp
7 files changed, 111 insertions(+), 127 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/84/178484/1
diff --git a/modules/interface/manifests/aggregate.pp
b/modules/interface/manifests/aggregate.pp
index 19bea7c..089f9a4 100644
--- a/modules/interface/manifests/aggregate.pp
+++ b/modules/interface/manifests/aggregate.pp
@@ -3,23 +3,21 @@
$interface = $title
-if $::lsbdistid == 'Ubuntu' and versioncmp($::lsbdistrelease, '10.04') =
0 {
-augeas { aggregate member ${interface}:
-context = '/files/etc/network/interfaces/',
-changes = [
-set auto[./1 = '${interface}']/1 '${interface}',
-set iface[. = '${interface}'] '${interface}',
-set iface[. = '${interface}']/family 'inet',
-set iface[. = '${interface}']/method 'manual',
-],
-notify = Exec[ifup ${interface}]
-}
+augeas { aggregate member ${interface}:
+context = '/files/etc/network/interfaces/',
+changes = [
+set auto[./1 = '${interface}']/1 '${interface}',
+set iface[. = '${interface}'] '${interface}',
+set iface[. = '${interface}']/family 'inet',
+set iface[. = '${interface}']/method 'manual',
+],
+notify = Exec[ifup ${interface}]
+}
-exec { ifup ${interface}:
-command = /sbin/ifup --force ${interface}; /sbin/ip link set
dev ${interface} up,
-require = Augeas[aggregate member ${interface}],
-refreshonly = true
-}
+exec { ifup ${interface}:
+command = /sbin/ifup --force ${interface}; /sbin/ip link set dev
${interface} up,
+require = Augeas[aggregate member ${interface}],
+refreshonly = true
}
}
@@ -29,64 +27,62 @@
# Use the definition title as the destination (aggregated) interface
$aggr_interface = $title
-if $::lsbdistid == 'Ubuntu' and versioncmp($::lsbdistrelease, '10.04') =
0 {
-if $orig_interface != '' {
-# Convert an existing interface, e.g. from eth0 to bond0
-$augeas_changes = [
-set auto[./1 = '${orig_interface}']/1 '${aggr_interface}',
-set iface[. = '${orig_interface}'] '${aggr_interface}'
-]
+if $orig_interface != '' {
+# Convert an existing interface, e.g. from eth0 to bond0
+$augeas_changes = [
+set auto[./1 = '${orig_interface}']/1 '${aggr_interface}',
+set iface[. = '${orig_interface}'] '${aggr_interface}'
+]
-# Bring down the old interface after conversion
-exec { ip addr flush dev ${orig_interface}:
-command = /sbin/ip addr flush dev ${orig_interface},
-before = Exec[ifup ${aggr_interface}],
-subscribe = Augeas[create ${aggr_interface}],
-refreshonly = true,
-notify = Exec[ifup ${aggr_interface}]
-}
-} else {
-$augeas_changes = [
-set auto[./1 = '${aggr_interface}']/1 '${aggr_interface}',
-set iface[. = '${aggr_interface}'] '${aggr_interface}',
-set iface[. = '${aggr_interface}']/family 'inet',
-set iface[. = '${aggr_interface}']/method 'manual'
-]
+# Bring down the old interface after conversion
+exec { ip addr flush dev ${orig_interface}:
+command = /sbin/ip addr flush dev ${orig_interface},
+before = Exec[ifup ${aggr_interface}],
+subscribe = Augeas[create ${aggr_interface}],
+refreshonly = true,
+notify = Exec[ifup ${aggr_interface}]
}
+} else {
+$augeas_changes = [
+set auto[./1 = '${aggr_interface}']/1 '${aggr_interface}',
+set iface[. = '${aggr_interface}'] '${aggr_interface}',
+set iface[. = '${aggr_interface}']/family 'inet',
+set iface[. = '${aggr_interface}']/method 'manual'
+]
+}
-augeas { create ${aggr_interface}:
-context = '/files/etc/network/interfaces/',
-changes = $augeas_changes,
-onlyif = match iface[. = '${aggr_interface}']
[MediaWiki-commits] [Gerrit] interface: drop support for Ubuntu 10.04 - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: interface: drop support for Ubuntu 10.04
..
interface: drop support for Ubuntu 10.04
Change-Id: Ifb5f1761c63971f0d6320c3f8631b3857a325de2
---
M modules/interface/manifests/aggregate.pp
M modules/interface/manifests/ip.pp
M modules/interface/manifests/manual.pp
M modules/interface/manifests/setting.pp
M modules/interface/manifests/tagged.pp
M modules/interface/manifests/tun6to4.pp
M modules/interface/manifests/up_command.pp
7 files changed, 111 insertions(+), 127 deletions(-)
Approvals:
Filippo Giunchedi: Looks good to me, but someone else must approve
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/interface/manifests/aggregate.pp
b/modules/interface/manifests/aggregate.pp
index 19bea7c..089f9a4 100644
--- a/modules/interface/manifests/aggregate.pp
+++ b/modules/interface/manifests/aggregate.pp
@@ -3,23 +3,21 @@
$interface = $title
-if $::lsbdistid == 'Ubuntu' and versioncmp($::lsbdistrelease, '10.04') =
0 {
-augeas { aggregate member ${interface}:
-context = '/files/etc/network/interfaces/',
-changes = [
-set auto[./1 = '${interface}']/1 '${interface}',
-set iface[. = '${interface}'] '${interface}',
-set iface[. = '${interface}']/family 'inet',
-set iface[. = '${interface}']/method 'manual',
-],
-notify = Exec[ifup ${interface}]
-}
+augeas { aggregate member ${interface}:
+context = '/files/etc/network/interfaces/',
+changes = [
+set auto[./1 = '${interface}']/1 '${interface}',
+set iface[. = '${interface}'] '${interface}',
+set iface[. = '${interface}']/family 'inet',
+set iface[. = '${interface}']/method 'manual',
+],
+notify = Exec[ifup ${interface}]
+}
-exec { ifup ${interface}:
-command = /sbin/ifup --force ${interface}; /sbin/ip link set
dev ${interface} up,
-require = Augeas[aggregate member ${interface}],
-refreshonly = true
-}
+exec { ifup ${interface}:
+command = /sbin/ifup --force ${interface}; /sbin/ip link set dev
${interface} up,
+require = Augeas[aggregate member ${interface}],
+refreshonly = true
}
}
@@ -29,64 +27,62 @@
# Use the definition title as the destination (aggregated) interface
$aggr_interface = $title
-if $::lsbdistid == 'Ubuntu' and versioncmp($::lsbdistrelease, '10.04') =
0 {
-if $orig_interface != '' {
-# Convert an existing interface, e.g. from eth0 to bond0
-$augeas_changes = [
-set auto[./1 = '${orig_interface}']/1 '${aggr_interface}',
-set iface[. = '${orig_interface}'] '${aggr_interface}'
-]
+if $orig_interface != '' {
+# Convert an existing interface, e.g. from eth0 to bond0
+$augeas_changes = [
+set auto[./1 = '${orig_interface}']/1 '${aggr_interface}',
+set iface[. = '${orig_interface}'] '${aggr_interface}'
+]
-# Bring down the old interface after conversion
-exec { ip addr flush dev ${orig_interface}:
-command = /sbin/ip addr flush dev ${orig_interface},
-before = Exec[ifup ${aggr_interface}],
-subscribe = Augeas[create ${aggr_interface}],
-refreshonly = true,
-notify = Exec[ifup ${aggr_interface}]
-}
-} else {
-$augeas_changes = [
-set auto[./1 = '${aggr_interface}']/1 '${aggr_interface}',
-set iface[. = '${aggr_interface}'] '${aggr_interface}',
-set iface[. = '${aggr_interface}']/family 'inet',
-set iface[. = '${aggr_interface}']/method 'manual'
-]
+# Bring down the old interface after conversion
+exec { ip addr flush dev ${orig_interface}:
+command = /sbin/ip addr flush dev ${orig_interface},
+before = Exec[ifup ${aggr_interface}],
+subscribe = Augeas[create ${aggr_interface}],
+refreshonly = true,
+notify = Exec[ifup ${aggr_interface}]
}
+} else {
+$augeas_changes = [
+set auto[./1 = '${aggr_interface}']/1 '${aggr_interface}',
+set iface[. = '${aggr_interface}'] '${aggr_interface}',
+set iface[. = '${aggr_interface}']/family 'inet',
+set iface[. = '${aggr_interface}']/method 'manual'
+]
+}
-augeas { create ${aggr_interface}:
-context = '/files/etc/network/interfaces/',
-changes = $augeas_changes,
-onlyif = match
