BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/256842
Change subject: interface::tagged - do not use hotplug
......................................................................
interface::tagged - do not use hotplug
This is a partial revert of ebb8cf3d9 , leaving just the
interface::manual portion active. It turns out hotplug is a bad
idea for the tagged VLAN virtual interfaces.
Bug: T110530
Change-Id: I15ab7317e3b801bb5461a22ed32672aeeee59222
---
M modules/interface/manifests/tagged.pp
M modules/role/manifests/labs/openstack/nova.pp
2 files changed, 3 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/42/256842/1
diff --git a/modules/interface/manifests/tagged.pp
b/modules/interface/manifests/tagged.pp
index 23c5b1b..78bcb7d 100644
--- a/modules/interface/manifests/tagged.pp
+++ b/modules/interface/manifests/tagged.pp
@@ -1,11 +1,5 @@
-define interface::tagged($base_interface, $vlan_id, $address=undef,
$netmask=undef, $family='inet', $method='static', $up=undef, $down=undef,
$remove=undef, $hotplug=true) {
+define interface::tagged($base_interface, $vlan_id, $address=undef,
$netmask=undef, $family='inet', $method='static', $up=undef, $down=undef,
$remove=undef) {
require_package('vlan')
-
- if $hotplug {
- $act_type = 'allow-hotplug'
- } else {
- $act_type = 'auto'
- }
$intf = "${base_interface}.${vlan_id}"
@@ -33,11 +27,11 @@
}
if $remove == true {
- $augeas_cmd = [ "rm ${act_type}[./1 = '${intf}']",
+ $augeas_cmd = [ "rm auto[./1 = '${intf}']",
"rm iface[. = '${intf}']"
]
} else {
- $augeas_cmd = [ "set ${act_type}[./1 = '${intf}']/1 '${intf}'",
+ $augeas_cmd = [ "set auto[./1 = '${intf}']/1 '${intf}'",
"set iface[. = '${intf}'] '${intf}'",
"set iface[. = '${intf}']/family '${family}'",
"set iface[. = '${intf}']/method '${method}'",
diff --git a/modules/role/manifests/labs/openstack/nova.pp
b/modules/role/manifests/labs/openstack/nova.pp
index 75080bb..2bdac0d 100644
--- a/modules/role/manifests/labs/openstack/nova.pp
+++ b/modules/role/manifests/labs/openstack/nova.pp
@@ -242,7 +242,6 @@
method => 'manual',
up => 'ip link set $IFACE up',
down => 'ip link set $IFACE down',
- hotplug => false,
}
class { '::openstack::nova::network':
@@ -293,7 +292,6 @@
method => 'manual',
up => 'ip link set $IFACE up',
down => 'ip link set $IFACE down',
- hotplug => false,
}
class { '::openstack::nova::compute':
--
To view, visit https://gerrit.wikimedia.org/r/256842
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I15ab7317e3b801bb5461a22ed32672aeeee59222
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
