Ryan Lane has submitted this change and it was merged.
Change subject: Order bonding before tagging for network node
......................................................................
Order bonding before tagging for network node
Change-Id: Ia74c6362ce9564a860a75321eb537d7f5f00a5b5
---
M manifests/openstack.pp
M manifests/role/nova.pp
M manifests/site.pp
3 files changed, 23 insertions(+), 9 deletions(-)
Approvals:
Ryan Lane: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/openstack.pp b/manifests/openstack.pp
index 79bbaf8..6e04a80 100644
--- a/manifests/openstack.pp
+++ b/manifests/openstack.pp
@@ -124,14 +124,6 @@
$instance_status_wiki_user,
$instance_status_wiki_pass) {
- interface_tagged { $novaconfig["network_flat_interface"]:
- base_interface => $novaconfig["network_flat_interface_name"],
- vlan_id => $novaconfig["network_flat_interface_vlan"],
- method => "manual",
- up => 'ip link set $IFACE up',
- down => 'ip link set $IFACE down',
- }
-
package { [ "nova-common", "python-keystone" ]:
ensure => present;
}
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index 32aad9d..6b589db 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -263,6 +263,10 @@
class { "openstack::api-service": openstack_version =>
$openstack_version, novaconfig => $novaconfig }
}
+class role::nova::network::bonding {
+ interface_aggregate { "bond1": orig_interface => "eth1", members => [
"eth1", "eth2", "eth3" ] }
+}
+
class role::nova::network {
include role::nova::config::pmtpa,
role::nova::config::eqiad
@@ -273,6 +277,17 @@
"pmtpa" => $role::nova::config::pmtpa::novaconfig,
"eqiad" => $role::nova::config::eqiad::novaconfig,
}
+
+ require role::nova::network::bonding
+
+ interface_tagged { $novaconfig["network_flat_interface"]:
+ base_interface => $novaconfig["network_flat_interface_name"],
+ vlan_id => $novaconfig["network_flat_interface_vlan"],
+ method => "manual",
+ up => 'ip link set $IFACE up',
+ down => 'ip link set $IFACE down',
+ }
+
class { "openstack::network-service": openstack_version =>
$openstack_version, novaconfig => $novaconfig }
}
@@ -312,6 +327,14 @@
"eqiad" => $role::nova::config::eqiad::novaconfig,
}
+ interface_tagged { $novaconfig["network_flat_interface"]:
+ base_interface => $novaconfig["network_flat_interface_name"],
+ vlan_id => $novaconfig["network_flat_interface_vlan"],
+ method => "manual",
+ up => 'ip link set $IFACE up',
+ down => 'ip link set $IFACE down',
+ }
+
class { "openstack::compute-service": openstack_version =>
$openstack_version, novaconfig => $novaconfig }
if $realm == "labs" {
diff --git a/manifests/site.pp b/manifests/site.pp
index 839a0c6..84e35aa 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2513,7 +2513,6 @@
role::nova::api
interface_ip { "openstack::network_service_public_dynamic_snat":
interface => "lo", address => "208.80.153.192" }
- interface_aggregate { "bond1": orig_interface => "eth1", members => [
"eth1", "eth2", "eth3" ] }
}
node /virt([5-9]|1[0-1]).pmtpa.wmnet/ {
--
To view, visit https://gerrit.wikimedia.org/r/52153
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia74c6362ce9564a860a75321eb537d7f5f00a5b5
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ryan Lane <[email protected]>
Gerrit-Reviewer: Ryan Lane <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
